From 5c104e036fdb78ed3581acb6d70efa75779834f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:24:26 +0800 Subject: [PATCH 01/44] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..5f809e6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..0cfb344 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From a285532d22bd862a50487b3c0bccd3dee73ab243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 22 Sep 2020 17:14:27 +0800 Subject: [PATCH 02/44] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'.DS=5FStore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Fri, 23 Oct 2020 17:51:10 +0800 Subject: [PATCH 03/44] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,2894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 4 +++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..3010027 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -278,8 +278,8 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; - @ApiParam(value = "标题") @Transient + @ApiParam(value = "标题") public String title; @Transient @@ -346,6 +346,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; + @Transient + @ApiParam("查询状态集合") + public List orderStatusList; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 47d5248..b8df6db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 库位物料表 @@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean { @ApiParam("库位类型") private Integer locateType; + @Transient + @ApiParam("库位类型") + private List locateTypeList; + + @Transient + @ApiParam("物料类型") + private List partTypeList; + + @Transient + @ApiParam(value = "存储区") + private String zoneNo; + + @Transient + @ApiParam(value = "仓库") + private String whNo; + + @Transient + @ApiParam(value = "库存单位") + private String stockUnit; + public Double getMin() { return this.min == null ? 0 : this.min; } @@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean { return this.min ==null?0:this.min.doubleValue(); } + public WmsLocatePart() { + } + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, + String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index e92e884..abd240f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -86,6 +86,10 @@ public class WmsSerialSnTrans extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isOk; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("操作类型") private List transTypeLst; From 82a769cae10ed6fa05723f9e5dfbe8ab833340cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 23 Oct 2020 18:04:22 +0800 Subject: [PATCH 04/44] =?UTF-8?q?=E3=80=9012040=2019073-=E5=AE=89=E7=81=AF?= =?UTF-8?q?BI=E7=95=8C=E9=9D=A2=E4=B8=AD=E4=BA=8B=E4=BB=B6=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=97=B6=E9=95=BF=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E4=B8=BA-3290=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=9C=A8?= =?UTF-8?q?=E6=A8=AA=E5=9D=90=E6=A0=87=E7=9A=84=E4=B8=8B=E6=96=B9=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98-20201026=E3=80=91=202887=2010=202.3.7?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java index e35260e..75ffc78 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -180,4 +180,8 @@ public class BaseManageQueue extends BaseBean implements Serializable { @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型代码") public String alarmDetailCode; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + public String memo; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 9571391..e427ce2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -457,7 +457,8 @@ public class AndonEnumUtil { ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"), ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"), AC_CODE("{J}","acCode","事件描述代码"), - AC_NAME("{K}","acNameRdd","事件描述名称"); + AC_NAME("{K}","acNameRdd","事件描述名称"), + MEMO("{M}","MEMO","备注"); private String value; private String code; From 63a06fcc274a856784765523a34eb5f5efa2b933 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 23 Oct 2020 19:21:03 +0800 Subject: [PATCH 05/44] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AB=AF=E7=99=BB=E5=BD=95=E5=8F=8A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AB=AF=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/bean/SwebMovementToWms.java | 99 ----------------- .../estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java | 118 --------------------- .../estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java | 97 ----------------- .../estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java | 46 -------- .../repository/SwebMovementToWmsRepository.java | 9 -- .../sweb/repository/SwebPoToWmsRepository.java | 9 -- .../sweb/repository/WmsPoToSwebRepository.java | 9 -- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 18 ++-- 8 files changed, 9 insertions(+), 396 deletions(-) delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java deleted file mode 100644 index 7acd947..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_MOVEMENT_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebMovementToWms extends BaseBean { - private static final long serialVersionUID = -8089219927352225317L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编号") - private String vendorNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name = "MOVE_TYPE") - @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") - public Integer moveType; - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java deleted file mode 100644 index 493338b..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java +++ /dev/null @@ -1,118 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-06-10 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_PO_SN_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebPoSnToWms extends BaseBean { - - private static final long serialVersionUID = 746409789382994374L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; - - @ApiParam("供应商名称") - @Column(name = "VENDOR_NAME") - private String vendorName; - - @Column(name = "PART_NO") - @ApiParam(value = "零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam(value = "零件名称") - private String partName; - - @ApiParam("零件类型") - @Column(name = "PART_TYPE") - private Integer partType; - - @ApiParam(value = "单位") - @Column(name = "UNIT") - private String unit; - - @Column(name = "BOX_QTY") - @ColumnDefault("0") - @ApiParam(value = "箱数", example = "0") - private Integer boxQty; - - @Column(name = "SERIAL_NO") - @ApiParam(value = "序列号") - private String serialNo; - - @Column(name = "SN") - @ApiParam(value = "箱条码") - private String sn; - - @Column(name = "ERP_WAREHOUSE") - @ApiParam("库存地") - private String erpWarehouse; - - @Column(name = "PRODUCTION_TIME") - @ApiParam(value = "产生时间") - private String productionTime; - - @Column(name = "PRINT_TIME") - @ApiParam(value = "打印时间") - private String printTime; - - @Column(name = "PRINTS") - @ApiParam("打印次数") - private Integer prints; - - @Column(name = "CHECK_CODE") - @ApiParam(value = "检验编号") - private String checkCode; - - @Column(name = "STOVE_NO") - @ApiParam(value = "特殊批号") - private String stoveNo; - - @Column(name = "BATCH_NO") - @ApiParam(value = "批次号") - private String batchNo; - - @ApiParam("是否同步") - @Column(name = "IS_SYN") - private String isSyn; - - @Column(name = "REC_TIME") - @ApiParam(value = "收货时间") - private String recTime; - - @Column(name = "PACKAGE_NO") - @ApiParam(value = "包装编号") - private String packageNo; - - @ColumnDefault("0") - @Column(name = "WEIGHT") - @ApiParam(value = "重量") - private Double weight; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java deleted file mode 100644 index 65babf1..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebPoToWms extends BaseBean { - - private static final long serialVersionUID = -3999194389200855165L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "VERSION") - @ApiParam("版本") - public String version; - - @Column(name = "ITEM") - @ApiParam("行号") - private Integer item; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - private Double qty; - - @Column(name = "VENDOR_NO") - @ApiParam("供应商") - private String vendorNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "0") - private Double printQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PLAN_DATE") - @ApiParam("计划交货日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam("计划交货时间") - private String planTime; - - @Column(name = "ERP_AREA_NO") - @ApiParam("默认收货库存地") - private String erpAreaNo; - - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam("标准包装") - private Double snp; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java deleted file mode 100644 index 4ec038f..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsPoToSweb extends BaseBean { - private static final long serialVersionUID = 4710841067412420270L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java deleted file mode 100644 index 6059cb8..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebMovementToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java deleted file mode 100644 index 4fea058..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebPoToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java deleted file mode 100644 index 419d43c..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb; -import org.springframework.stereotype.Repository; - -@Repository -public interface WmsPoToSwebRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 90a1736..1b9d541 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -30,7 +30,7 @@ public class SwebHqlPack { * @param hqlStr * @return */ - private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { + public static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); @@ -212,14 +212,14 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { - DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); - return buildHql(master, result); - } +// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { +// DdlPackBean result = new DdlPackBean(); +// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); +// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); +// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); +// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); +// return buildHql(master, result); +// } public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); From 97be3f186a69da062b67d8b1ece3111f7320a9e6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 24 Oct 2020 00:21:54 +0800 Subject: [PATCH 06/44] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=98=E6=9B=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java index 83c05f9..bfeb9d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java @@ -43,6 +43,10 @@ public class MesWorkStartCache extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name = "PAUSE_TIME") + @ApiParam("暂停时间") + private String pauseTime; + @Column(name = "ACTUAL_START_TIME") @ApiParam("实际启动时间") private String actualStartTime; From 6907ab6dc0e7c559d747fd769133ebd049c2e4cd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 24 Oct 2020 14:02:24 +0800 Subject: [PATCH 07/44] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 7 +++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index ca619c2..5a6f7f2 100755 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -26,6 +26,8 @@ public class WmsJobParamModel implements Serializable { private Integer pageSize;//数据条数 private Integer isCheckSn;//是否检查条码存在 private Integer erpSyncFlag;//查询SHIPPING表的条件 + private String filterZoneNos;//过滤存储区 + private String zoneNos;//存储区 public int getMinuteDiffVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index 1e157b4..1cad321 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -75,7 +75,7 @@ public class WmsPickingWindowTime extends BaseBean { public WmsPickingWindowTime() { } - public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) { + public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime, String createDatetime, String modifyDatetime, Integer isDeleted, Integer isValid) { this.id = id; this.shiftNo = shiftNo; this.startTime = startTime; @@ -83,7 +83,10 @@ public class WmsPickingWindowTime extends BaseBean { this.latestEndTime = latestEndTime; this.shiftStartTime = shiftStartTime; this.shiftEndTime = shiftEndTime; - + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.isDeleted = isDeleted; + this.isValid = isValid; } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index ed602bf..0783140 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 拉动规则实体 @@ -48,4 +49,8 @@ public class WmsPullRule extends BaseBean { @ApiParam(value = "尾数计算方式", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; + + @Transient + @ApiParam(value = "通过存储区物料获取物流路线") + private boolean routingbyZonePartDisAble; } From f6ad2824b2590d0baac91b6b3209177582ebcda1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 24 Oct 2020 18:51:30 +0800 Subject: [PATCH 08/44] =?UTF-8?q?=2011984=2019048-=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=8A=A5=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5-20201020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 7582002..fce6b31 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -375,6 +375,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("行颜色") private String rowColor; + @Transient + @ApiParam("一检数量") + private Integer endCheckQty; + + @Transient + @ApiParam("终检数量") + private Integer finalInspectionQty; + + @Transient + @ApiParam("已报工数量") + private Integer productOffLineQty; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 3de97d5b98d7acf42803e674cc7fc5bd278c2d1c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 26 Oct 2020 11:38:31 +0800 Subject: [PATCH 09/44] =?UTF-8?q?=E5=8C=97=E4=BA=ACMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index c5a9443..694ebfc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -37,7 +37,7 @@ public class WmsQCStatusModel { @ApiParam("计划质检完成时间") private String planCompleteTime; - @ApiParam("实际质检完成实际") + @ApiParam("实际质检完成时间") private String actualCompleteTime; @ApiParam("状态") From 1037ad6e6896e062e40055706aaa0942ce0fc063 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 26 Oct 2020 12:47:50 +0800 Subject: [PATCH 10/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 01ba990..726dc1b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -748,7 +748,6 @@ public class WmsHqlPack { //单据来源 DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); - getStringBuilderPack(wmsShipping, result); return result; } From a8cdba48c39c81da859c17562989501472b475dc Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 26 Oct 2020 13:38:30 +0800 Subject: [PATCH 11/44] =?UTF-8?q?=E5=90=88=E5=B9=B6Master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 2bf0e5c..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 0cfb344..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From a9535232459a9a9889fbd4f1109137d608928608 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 26 Oct 2020 19:38:14 +0800 Subject: [PATCH 12/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ERP=20=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E7=9B=B8=E5=85=B3=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/snapshot/erp/WmsErpCOGISnapshot.java | 64 +++++++++++++++ .../wms/bean/snapshot/erp/WmsErpCheckPoint.java | 34 ++++++++ .../bean/snapshot/erp/WmsErpInterfaceSnapshot.java | 68 ++++++++++++++++ .../bean/snapshot/erp/WmsErpStockQuanSnapshot.java | 55 +++++++++++++ .../wms/bean/snapshot/erp/WmsErpTransSnapshot.java | 94 ++++++++++++++++++++++ .../pojo/wms/repository/WmsErpCOGIRepository.java | 9 +++ .../wms/repository/WmsErpStockQuanRepository.java | 9 +++ 7 files changed, 333 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java new file mode 100644 index 0000000..c77e082 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP COGI快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_COGI_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpCOGISnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095222692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + private String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java new file mode 100644 index 0000000..9171ffb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ERP 数据快照时间 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_CHECK_POINT") +public class WmsErpCheckPoint extends BaseBean { + + private static final long serialVersionUID = 5589607687871639189L; + + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''", nullable=false) + @ApiParam("快照时间") + public String snapshotTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java new file mode 100644 index 0000000..bb1812d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 报文接口快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_INTERFACE_SNAPSHOT", indexes = { + @Index(columnList = "SID"), + @Index(columnList = "SENDER"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "RECEIVER"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpInterfaceSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095333692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "SID") + @ApiParam("业务唯一编号") + public String sid; + + @Column(name = "SENDER") + @ApiParam("发送方") + public String sender; + + @Column(name = "SEND_TIME") + @ApiParam("发出时间") + public String sendTime; + + @Column(name = "RECEIVER") + @ApiParam("接收方") + public String receiver; + + @Column(name = "RECEIVED_TIME") + @ApiParam("接收时间") + public String receivedTime; + + @Column(name = "TRANS_TIME") + @ApiParam("处理时间") + public String transTime; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public String transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java new file mode 100644 index 0000000..ac326b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 库存结余快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_STOCK_QUAN_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpStockQuanSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java new file mode 100644 index 0000000..e0a51d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 交易快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_TRANS_SNAPSHOT", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpTransSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095555692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单据编号") + private String orderNo; + + @Column(name = "YEAR") + @ApiParam("凭证年度") + private String year; + + @Column(name = "ITEM") + @ApiParam("行项目") + private String item; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name = "CUSTOMER_NO") + @ApiParam("客户编号") + private String customerNo; + + @Column(name = "AMOUNT") + @ApiParam("金额") + private Double amount; + + @Column(name = "DR_AND_CR") + @ApiParam("借贷标识：H=贷方- S=借方+") + private String drandcr; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java new file mode 100644 index 0000000..114da9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCOGISnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCOGIRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java new file mode 100644 index 0000000..2a767bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpStockQuanRepository extends BaseRepository { +} From 783022646cbcae5475ffe4d357dbdc5ddef0e280 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 26 Oct 2020 19:43:45 +0800 Subject: [PATCH 13/44] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=8A=B6=E6=80=81=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesRealTimeTakt.java | 44 ++++++++++++++++++++++ .../mes/repository/MesRealTimeTaktRepository.java | 14 +++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java new file mode 100644 index 0000000..22508ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REAL_TIME_TAKT") +@Api("MES_实时节拍") +public class MesRealTimeTakt extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2910474711746286558L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "REAL_TIME_TAKT") + @ApiParam("实时节拍") + private String realTimeTakt; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java new file mode 100644 index 0000000..765082d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRealTimeTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Repository +public interface MesRealTimeTaktRepository extends BaseRepository { +} From 62d5d62cef5d58e87c9188bfd6d24eed27f7f75c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 26 Oct 2020 20:32:29 +0800 Subject: [PATCH 14/44] =?UTF-8?q?=E5=8C=97=E4=BA=ACMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 10 +++++++--- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 58ebed3..cdd8873 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4035,7 +4035,7 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘盈"), INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 68abad8..85b257d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -148,7 +152,7 @@ public class WmsCSOrderDetails extends BaseBean { public String[] zoneNos; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异类型") @@ -156,7 +160,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer differenceType; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异集合") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index 694ebfc..d565516 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -56,9 +56,9 @@ public class WmsQCStatusModel { private Double proportion; @ApiParam("标准质检时间") - private Integer stdCheckTime; + private Double stdCheckTime; - public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) { + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { this.asnOrderNo = asnOrderNo; this.qcOrderNo = qcOrderNo; this.partNo = partNo; From 4d4ad7ff8470b475c42f88ec518d20b4c7ced3ea Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 27 Oct 2020 09:16:51 +0800 Subject: [PATCH 15/44] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 78 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java | 49 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 11 ++- .../mes/repository/MesBoardLineRepository.java | 15 +++++ .../pojo/mes/repository/MesPlanTaktRepository.java | 14 ++++ 5 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java new file mode 100644 index 0000000..1bbd48f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE") +@Api("看板产线配置") +public class MesBoardLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 5212593630787939081L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PLAN_OEE") + @ApiParam("目标OEE") + private Double planOee; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "PASS_PERCENT_MAX") + @ApiParam("良品率上限") + private Double passPercentMax; + + @Column(name = "PASS_PERCENT_MIN") + @ApiParam("良品率下限") + private Double passPercentMin; + + @Column(name = "CAR_RUN_TIME") + @ApiParam("小车运行时间（分）") + private Integer carRunTime; + + @Column(name = "TEST_CAR_SUM") + @ApiParam("调试车数") + private Integer testCarSum; + + @Column(name = "PLAN_FIRST_PASS_YIELD") + @ApiParam("一次良品率目标值") + private Double planFirstPassYield; + + @Column(name = "PLAN_PASS_YIELD") + @ApiParam("最终良品率目标值") + private Double planPassYield; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java new file mode 100644 index 0000000..db59acd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_TAKT") +@Api("产线节拍表") +public class MesPlanTakt extends BaseBean implements Serializable { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 81c5005..5d27429 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; @@ -57,14 +58,20 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("作业时长") private Double workTimes; - @Column(name="SHIFT_SEQ") + @Column(name = "SHIFT_SEQ") @ApiParam("班次顺序") private Integer shiftSeq; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; + @Transient + private String queryBeginTime; + + @Transient + private String queryEndTime; + public int getShiftSeqVal() { return this.shiftSeq == null ? 0 : this.shiftSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java new file mode 100644 index 0000000..bf48a0b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java new file mode 100644 index 0000000..bed3882 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPlanTakt; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPlanTaktRepository extends BaseRepository { +} From 582ef23ca3c9f53dbdf26106fed7083556bb97f8 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 27 Oct 2020 13:10:16 +0800 Subject: [PATCH 16/44] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSWEB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 1b9d541..50964f2 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -52,11 +52,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); - } else { - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - } + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); From 24acb86dff63ae3c476ddfc7fb33049770fe8a63 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 27 Oct 2020 13:19:42 +0800 Subject: [PATCH 17/44] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2&=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index c6e6c68..183ab40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -332,4 +332,28 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; } + + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.totalQty = totalQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + this.areaNo = areaNo; + } } From d9040143f92d1e4cfc0300615fe3aba6fe0a415a Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 27 Oct 2020 14:45:00 +0800 Subject: [PATCH 18/44] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF-=E6=AF=8F=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E4=BA=A7=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MesBoardHourProductCountModel.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java new file mode 100644 index 0000000..5e12c33 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :中航-每小时产量 + * @Reference : + * @author: dominic + * @date: 2020/10/23 13:46 + * @Modify: + */ + +@Data +public class MesBoardHourProductCountModel { + @ApiParam("时间段") + private String hour; + + @ApiParam("计数") + private Integer count; +} From 6fcf32aa805f5786196364f8801f80ec93bc36bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 27 Oct 2020 17:51:22 +0800 Subject: [PATCH 19/44] =?UTF-8?q?=E3=80=902890=2010=202.3.8=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E4=BD=9C=E4=B8=9A=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index aad4948..d6fe7d9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -294,6 +294,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="故障时长-分钟") private Integer brokenTime; + @Transient + @ApiParam(value ="故障字符串") + private String faultStr; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index 3e41a51..66377b6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -36,7 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("安灯记录") +@Api("去去去去去去去去去安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 4667499369694353351L; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index cf92a50..df23bab 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Column(name="FAULT_STR") + @ApiParam(value ="故障字符串") + private String faultStr; + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index cdd5365..969ad3f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -904,6 +904,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80 + * 20201027 增加安灯状态 90 =优先级, 10 =故障字符串 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -914,7 +915,9 @@ public class AndonEnumUtil { DETAIL_TYPE("50", "安灯子类型"), AC_CODE("60", "原因代码"), PROD_INFO("70", "产品信息"), - LINE_INFO("80", "产量信息"); + LINE_INFO("80", "产量信息"), + PRIORITY_LEVEL("90", "优先级"), + FAULT_STR("100", "故障字符串"); private String value; private String description; @@ -1063,7 +1066,8 @@ public class AndonEnumUtil { public enum ALARM_PRIORITY{ FIRST(10,"一级"), SECOND(20,"二级"), - THIRD(30,"三级"); + THIRD(30,"三级"), + FOUR(40,"四级"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 427a4a9..27b6637 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1454,7 +1454,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { MATERIAL(10, "MATERIAL", "物料"), - ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"), + WORK_ORDER(30, "WORK_ORDER", "工单信息"); private int value; private String code; From 586365dc6956089011c22c4bc8a77f4ed022149e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 27 Oct 2020 18:31:37 +0800 Subject: [PATCH 20/44] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,#2894,#2901?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b28e142..13650d8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7479,7 +7479,8 @@ public class WmsEnumUtil { PICK(40, "REPAIR", "挑选"), REPAIR(50, "REPAIR", "返修"), BIND(60, "BIND", "绑定"), - OUTSTOCK(70, "OUTSTOCK", "出库"); + OUTSTOCK(70, "OUTSTOCK", "出库"), + RE_PACKING(80, "RE_PACKING", "重绑"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index abd240f..b59daf8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name = "BATCH_NO") @ApiParam(value = "BATCH号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String batchNo; @Column(name="SERIAL_SN") @@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="BH_TYPE") @ApiParam("BH类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) private Integer bhType; @Column(name = "PART_NO") @@ -77,19 +77,26 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) private Integer transType; @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2) private Integer isOk; @Column(name = "LOT_NO") @ApiParam("生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotNo; + @Column(name = "STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class) + @ApiParam("状态") + private Integer status; + @Transient @ApiParam("操作类型") private List transTypeLst; From 5227540ecce5c3acf1a35fd504081f56b51d319c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 27 Oct 2020 20:08:01 +0800 Subject: [PATCH 21/44] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group1/default/20201021/15/50/3/123123123123.jpeg | Bin 0 -> 15453 bytes .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 11 ++++++----- .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 5 ++++- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 13 ++++++++----- .../i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 13 ++++++++----- 6 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..76e3cc08327fad7535079cc68b173c9616218511 GIT binary patch literal 15453 zcmb7r2Ut_h)^316=mhB{5Cj2HdXr8R1f(}nilCsVG*HAB{)PxM5H97^kii8LTt=zLjT{#MKyqu5Jv)M7Y~OLfJ=#k zM~QP$4`9YZ1>j-f;sE|SaB%T}_yizAY^^#NfP;sJEn^+PCm_JV2jBp(CCV%KYy^TZ zD(%Nk)K`T9qfU2hWFU%Vgx{nt-+wA*`SO^z_^R(IW)hw0{_a z3BsIUKg7-8Ga*kxofNG0n}k2yUn0B=`AgkcF(0fL zOh8fK7nn<$V80mqn=fqRP5Hky{=33IlmO{23D(l8hoqKMaM1nkx?hg|Wf-dx>)~IW z@ON)e{ffZLic5z6M~lD6{zU z3k>*;_uqWNg_{M!2?*(5K;xmm@35Bum;lW2kLTFO;131A=)ZLBPe1%SGnXw!7?vZ- zpd~M$kEa6RM3-v+*7?WGWtk`#PQY?$(R?Zpd&|vD|Ag=5PXc8JmGTiUylpZKfWI~UGOdRG|H;@tVa1w z#^w$O-KWnsrz8$LzzhSC1bi2YY|QL=aM&qX93s+C1tpfiz<&M-iMWsRcdY-8OWa=( z_nR}E5Xm}U?OFKD@3+X`A^2DL{1Z2SUVe{V%=o;KuCUB@=`=Bccgbp&%}rx+)GTe% zQutDLR^~}B0B?JkF8~;yF4xczNwx?YVfyLjSÏ&13s$=T$xPaaohe8zMll`0lS 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 Date: Tue, 27 Oct 2020 20:09:11 +0800 Subject: [PATCH 22/44] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group1/default/20201021/15/50/3/123123123123.jpeg | Bin 15453 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg deleted file mode 100644 index 76e3cc08327fad7535079cc68b173c9616218511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15453 zcmb7r2Ut_h)^316=mhB{5Cj2HdXr8R1f(}nilCsVG*HAB{)PxM5H97^kii8LTt=zLjT{#MKyqu5Jv)M7Y~OLfJ=#k zM~QP$4`9YZ1>j-f;sE|SaB%T}_yizAY^^#NfP;sJEn^+PCm_JV2jBp(CCV%KYy^TZ zD(%Nk)K`T9qfU2hWFU%Vgx{nt-+wA*`SO^z_^R(IW)hw0{_a z3BsIUKg7-8Ga*kxofNG0n}k2yUn0B=`AgkcF(0fL zOh8fK7nn<$V80mqn=fqRP5Hky{=33IlmO{23D(l8hoqKMaM1nkx?hg|Wf-dx>)~IW z@ON)e{ffZLic5z6M~lD6{zU z3k>*;_uqWNg_{M!2?*(5K;xmm@35Bum;lW2kLTFO;131A=)ZLBPe1%SGnXw!7?vZ- zpd~M$kEa6RM3-v+*7?WGWtk`#PQY?$(R?Zpd&|vD|Ag=5PXc8JmGTiUylpZKfWI~UGOdRG|H;@tVa1w z#^w$O-KWnsrz8$LzzhSC1bi2YY|QL=aM&qX93s+C1tpfiz<&M-iMWsRcdY-8OWa=( z_nR}E5Xm}U?OFKD@3+X`A^2DL{1Z2SUVe{V%=o;KuCUB@=`=Bccgbp&%}rx+)GTe% zQutDLR^~}B0B?JkF8~;yF4xczNwx?YVfyLjSÏ&13s$=T$xPaaohe8zMll`0lS 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 Date: Tue, 27 Oct 2020 20:33:18 +0800 Subject: [PATCH 23/44] =?UTF-8?q?Fix=20bug#12019=2012019-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index bc69da7..1e25ec8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } + public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime, + Double snp, Long totalBoxes, Double qty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.planTime = planTime;//批次号（yyyyMMdd） + this.snp = snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } + public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; From b6a309bacfbba8eb0bfa30f02f06a09e16599b7a Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 27 Oct 2020 20:36:37 +0800 Subject: [PATCH 24/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ERP=20=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/snapshot/erp/WmsErpQuanAreas.java | 33 ++++++++++++++++++++++ .../wms/repository/WmsErpCheckPointRepository.java | 9 ++++++ .../wms/repository/WmsErpQuanAreasRepository.java | 9 ++++++ 3 files changed, 51 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java new file mode 100644 index 0000000..7e712f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ERP 库存比对包含的库存地点 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-27 14:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_QUAN_AREAS") +public class WmsErpQuanAreas extends BaseBean { + private static final long serialVersionUID = 5560607687871639209L; + + @Column(name="AREA_NO") + @ApiParam("库存地点") + public String area_no; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java new file mode 100644 index 0000000..e21870a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCheckPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java new file mode 100644 index 0000000..02b6561 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpQuanAreasRepository extends BaseRepository { +} From 36928196c1bb7f38e42f047a6468bfc5d743e094 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 27 Oct 2020 21:01:18 +0800 Subject: [PATCH 25/44] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E7=9C=8B=E6=9D=BF-?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java index ae43578..bbbb380 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable { @Column(name = "PICTURE_URL") @ApiParam("图片路径") private String pictureUrl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java index be79660..b2638a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java @@ -33,12 +33,12 @@ public class MesBoardSwitchCfg extends BaseBean implements Serializable { @ApiParam("看板代码") private String boardCode; - @Column(name = "SWITCH_INTERRVAL") + @Column(name = "SWITCH_INTERVAL") @ApiParam("屏切换频次") - private Integer switchInterrval; + private Integer switchInterval; - @Column(name = "LINE_SWITCH_INTERRVAL") + @Column(name = "LINE_SWITCH_INTERVAL") @ApiParam("产线切换频次") - private Integer lineSwitchInterrval; + private Integer lineSwitchInterval; } From 3ad59884a85fe9e60a539caad13661732687d79a Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 27 Oct 2020 21:43:56 +0800 Subject: [PATCH 26/44] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=8F=90=E5=89=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index e221563..79b7084 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,6 +72,11 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; + @Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600") + @ApiParam(value = "计算未完成工单的提前时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer preWoMinute; + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) From 1b6264e80da44af77758e0725ed0b12add32421a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 28 Oct 2020 09:36:33 +0800 Subject: [PATCH 27/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8754eae..f308538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -20,6 +20,21 @@ public class MgnBoardListModel { @ApiParam("当班实际产量") private Double shiftActualYield; + @ApiParam("当前时间分钟") + private String currentMinTime; + + /** + * 开班时间到当前时间按分钟累计计划数量 + */ + @ApiParam("每分钟计划产量") + private Double minPlanYield; + + /** + * 开班时间到当前时间按分钟累计实际数量 + */ + @ApiParam("每分钟实际产量") + private Double minActualYield; + @ApiParam("计划完成率") private String planCompleteRate; From 760307910a3abd9a1984a2ca2bf858a2f8427c03 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 28 Oct 2020 10:52:30 +0800 Subject: [PATCH 28/44] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/modelbean/WmsVendorDelayMasterModel.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index a3fd7c8..b327dc3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -17,6 +17,12 @@ import lombok.Data; public class WmsVendorDelayMasterModel extends BaseBean { private static final long serialVersionUID = 1589775350017343999L; + @ApiParam(value = "订单号") + private String orderNo; + + @ApiParam(value = "原因") + public String reason; + @ApiParam(value = "供应商代码") private String vendorNo; @@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long delayCount; + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + @ApiParam(value = "查询开始时间") private String startDateTime; @ApiParam(value = "查询结束时间") private String endDateTime; + @ApiParam("计划交货日期") + private String planDate; + + @ApiParam("计划交货时间") + private String planTime; + + @ApiParam("实际交货时间") + private String actualPlanTime; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { this.vendorNo = vendorNo; this.vendorName = vendorName; @@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean { this.createDatetime = createDateTime; } + public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.actualPlanTime = actualPlanTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } + + public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + public WmsVendorDelayMasterModel() { } From f57be38c2bd8bee3271e099dcdb17cc05e5a9246 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 11:28:33 +0800 Subject: [PATCH 29/44] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95-=E6=96=B0=E5=BB=BA=E5=AE=8C=E6=AF=95?= =?UTF-8?q?=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= =?UTF-8?q?->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index c55e93f..7f56701 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -580,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class) + Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ From 4684466e7e174a6fa1621db9230477bff5075f7b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 14:53:37 +0800 Subject: [PATCH 30/44] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7f56701..770d14b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -886,7 +886,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(model) from " + persistentClass.getSimpleName() + queryString.append("select count(0) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); From 5e1d0a75c965044961bb8009c9c948c3ceb09b92 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 15:07:43 +0800 Subject: [PATCH 31/44] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 770d14b..7f56701 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -886,7 +886,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(0) from " + persistentClass.getSimpleName() + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); From df35a22aac9b7f025223e2a4f8fbabe005c042a0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 15:10:02 +0800 Subject: [PATCH 32/44] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG#12121=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95-=20=E6=96=B0=E5=BB=BA=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7f56701..2ad2a01 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -580,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class) + Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ From d7bad41b2940930bd1d375ee2da7819eb0e42a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 28 Oct 2020 17:01:29 +0800 Subject: [PATCH 33/44] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG#12111=EF=BC=8C12110=EF=BC=8C12108=EF=BC=8C12105?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 183ab40..542301e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -356,4 +356,10 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; this.areaNo = areaNo; } + + public WmsStockQuan(String partNo, String partNameRdd, Double qty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + } } From c9378a7d8cb7ca6abc8ae913f7d229f04daeeaf4 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 28 Oct 2020 19:37:52 +0800 Subject: [PATCH 34/44] =?UTF-8?q?=E3=80=9011959=2019125+PDA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=8B=86=E5=88=86=E6=95=B0=E9=87=8F=E8=B6=85=E8=BF=87?= =?UTF-8?q?100=E9=83=A8=E5=88=86=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E4=B8=8D=E5=A2=9E=E5=8A=A0=E3=80=82+1020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e336469..c136a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,7 +237,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%"); } } @@ -250,7 +250,7 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 293f70d..f036e0d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1749,11 +1749,14 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack( + /*DdlPreparedPack.getOrderByPack( new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, - new String[]{"sn", "createDatetime"}, result); + new String[]{"sn", "createDatetime"}, result);*/ +// result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'"); + return result; } From 31cdda5b33e0918b9fd042c6b188df6439271596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 28 Oct 2020 20:24:07 +0800 Subject: [PATCH 35/44] =?UTF-8?q?feat(softswitch):=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,FTP=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81SID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++-- .../pojo/model/softswitch/SuitClientModel.java | 30 +++++++++++++++ .../i3plus/pojo/model/softswitch/SuitModel.java | 45 ++++++++++++++++++++++ .../pojo/model/softswitch/SuitRecordModel.java | 4 ++ .../pojo/model/softswitch/SuitServerModel.java | 17 ++++++++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 9 +++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 8 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 23191f8..753cfb3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil { CLOUD(5,"Cloud调用"), REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), - SOCKET(8,"socket"); + SOCKET(8,"socket"), + RETRY(9,"重试"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index f401265..337c41d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -245,12 +245,12 @@ public class CommonEnumUtil { return tmp; } - public static int descOf(boolean desc) { - return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int boolOfOfVal(boolean boolVal) { + return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static int descOf(int desc) { - return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int intOfVal(int boolIntVal) { + return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } public static TRUE_OR_FALSE valueOfEnum(int value){ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 4c82b54..7a1eea4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable { private Integer actionId; /** + * 调用方自定义标识 + */ + @XStreamAsAttribute + private String suitSid; + + /** + * 重试记录id + */ + private Long retryRecordId; + + /** * 适配器信息 */ private BsSuitCaseModel suitCaseModel; @@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } + + public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) { + this.requestSource = suitModel.getRequestSource(); + this.suitSid = suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); + this.suitCaseModel = suitCaseModel; + + // 设置默认 + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + // 设置默认 + this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + // 设置默认 + this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java new file mode 100644 index 0000000..984bf02 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * 软适配执行适配器(客户端服务端适配总入口) + * 所需的参数模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-28 15:51 + * @Modify: + **/ +@Data +public class SuitModel implements Serializable { + + private static final long serialVersionUID = 8981933192688480221L; + + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配SID") + private String suitSid; + + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class) + @ApiParam(value = "适配来源") + private Integer requestSource; + + @ApiParam(value = "重试记录id") + private Long retryRecordId; + + @ApiParam(value = "适配器参数XML") + private String paramXml; + + @ApiParam(value = "适配器参数") + private List bsSuitCaseParamList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java index 5367486..2b5db90 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import io.swagger.annotations.ApiModel; @@ -23,6 +24,9 @@ public class SuitRecordModel { @ApiModelProperty("适配文件") private BsSuitFile bsSuitFile; + @ApiModelProperty("分页信息") + private Pager pager; + public SuitRecordModel() { } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 0f5fcf7..4dd5f5f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable { // 请求ID private String requestId; + + // 调用方自定义标识 + private String suitSid; + + // 重试记录id + private Long retryRecordId; + // 传输单对象 @XmlElement(name = "data") @XStreamAlias("data") @@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable { // @XStreamImplicit private String analyzeMessage; + + public SuitServerModel(){ + } + public SuitServerModel(SuitModel suitModel){ + this.suitCaseCode = suitModel.getSuitCaseCode(); + this.requestSource = suitModel.getRequestSource(); + this.suitSid= suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + this.obj = suitModel.getParamXml(); + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 76b54fe..3f03e22 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseDetailId; + @Column(name = "SUIT_SID") + @ApiParam(value = "适配记录SID") + private String suitSid; + + @Column(name = "RETRY_RECORD_ID") + @ApiParam(value = "重试记录id") + @JsonSerialize(using = ToStringSerializer.class) + private Long retryRecordId; + @Column(name = "SUIT_METHOD_ID") @ApiParam(value = "适配方式id枚举（定时适配，主动适配）") private Integer suitMethodId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 2d9e16d..afb8677 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -320,6 +320,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); From f57f4e25be275d94de508184790e667313534826 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 28 Oct 2020 22:00:29 +0800 Subject: [PATCH 36/44] =?UTF-8?q?mgn-bj=20=E6=80=BB=E5=B1=8F=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 40 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++ .../i3plus/pojo/mes/model/QueueJitActualModel.java | 8 +++++ .../i3plus/pojo/mes/model/mgnbj/BjBoardModel.java | 41 ++++++++++++++++++++++ .../pojo/mes/model/mgnbj/BjBoardSeriesModel.java | 18 ++++++++++ 5 files changed, 111 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a0e0dde..fa8307a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7972,4 +7972,44 @@ public class MesEnumUtil { } } + /** + * 看板-安灯监控状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_QUEUE_STATUS { + CALL(10, "呼叫"), + RESPONSE(20, "响应"), + SOLVE(30, "解决"); + + private int value; + private String description; + + ANDON_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 0739b8d..4e32b80 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位类型名称") private String workCellTypeName; + @Transient + @ApiParam("安灯呼叫状态") + private Integer andonQueueStatus; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 31edd81..5e40bdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -111,4 +111,12 @@ public class QueueJitActualModel { this.createDatetime = createDatetime; } + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.produceCtgyCode = produceCtgyCode; + this.custPlantCode = custPlantCode; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java new file mode 100644 index 0000000..421d7e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 11:27 AM + * @Modify: + */ +@Data +public class BjBoardModel implements Serializable { + + @ApiParam("jsa数量") + private Integer jsaQty; + @ApiParam("完成数量") + private Integer completeQty; + @ApiParam("总数量") + private Integer totalQty; + @ApiParam("预警数量") + private Integer warnQty; + @ApiParam("预警率") + private Integer warnRate; + @ApiParam("目标合格率") + private Integer targetRate = 0; + @ApiParam("一次合格率") + private Integer onceQualityRate = 0; + + @ApiParam("x坐标内容") + private String xAxis; + + @ApiParam("x坐标内容") + private List xAxisList; + + @ApiParam("显示数据") + private List seriesModels; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java new file mode 100644 index 0000000..fa764fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class BjBoardSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("显示数量") + private Integer qty; +} From 104fa0efa5444fcd71185b4927b020d549751ba4 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 28 Oct 2020 22:09:05 +0800 Subject: [PATCH 37/44] =?UTF-8?q?=E5=AE=8C=E6=88=90ERP=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java index 7e712f7..26af6b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -24,10 +24,15 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_ERP_QUAN_AREAS") -public class WmsErpQuanAreas extends BaseBean { +public class WmsErpQuanAreas extends BaseBean implements Comparable { private static final long serialVersionUID = 5560607687871639209L; @Column(name="AREA_NO") @ApiParam("库存地点") - public String area_no; + public String areaNo; + + @Override + public int compareTo(WmsErpQuanAreas o) { + return this.getAreaNo().compareTo(o.getAreaNo()); + } } From 6d4e8608c47d88513a8a32dc4dd8d0a4c96c205c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:54:12 +0800 Subject: [PATCH 38/44] =?UTF-8?q?=E6=B3=A8=E5=A1=91=20=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 13 +++- .../pojo/mes/bean/MesBoardLineCoordsMatrix.java | 53 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardLineMatrix.java | 73 ++++++++++++++++++++++ .../pojo/mes/bean/MesBoardLineStaffMatrix.java | 61 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesLineFaultRecord.java | 43 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesStaff.java | 58 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 13 ++-- .../pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Document.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Head.java | 2 +- .../{mgnbj => mgn/bj}/JisaJphReportModel.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Message.java | 2 +- .../model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java | 2 +- .../{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java | 2 +- .../mes/model/{mgnbj => mgn/bj}/OptionCode.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Part.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Parts.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Pn.java | 3 +- .../i3plus/pojo/mes/model/mgn/tj/AndonModel.java | 20 ++++++ .../i3plus/pojo/mes/model/mgn/tj/DefectModel.java | 22 +++++++ .../pojo/mes/model/mgn/tj/GoodRateModel.java | 26 ++++++++ .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java | 30 +++++++++ .../pojo/mes/model/mgn/tj/ProductivityModel.java | 20 ++++++ .../pojo/mes/model/mgn/tj/StaffMatrixModel.java | 24 +++++++ .../MesBoardLineCoordsMatrixRepository.java | 16 +++++ .../repository/MesBoardLineMatrixRepository.java | 16 +++++ .../MesBoardLineStaffMatrixRepository.java | 16 +++++ .../repository/MesLineFaultRecordRepository.java | 16 +++++ .../pojo/mes/repository/MesStaffRepository.java | 16 +++++ 29 files changed, 542 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Document.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Head.java (94%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/JisaJphReportModel.java (82%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Message.java (95%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java (97%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java (83%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/OptionCode.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Part.java (96%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Parts.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Pn.java (92%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ba85092..b9aeefa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -1,11 +1,12 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +29,8 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") +@NoArgsConstructor +@AllArgsConstructor @Api("生产报工表") public class IfProductOffLine extends BaseBean implements Serializable { @@ -153,4 +156,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "BASE_MODULE") @ApiParam("BaseModule零件号") private String baseModule; + + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { + this.partNo = partNo; + this.packageNo = packageNo; + this.qty = qty; + this.workCenterCode = workCenterCode; + this.qcStatus = qcStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java new file mode 100644 index 0000000..aa0bce6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_COORDS_MATRIX") +@Api("MES_看板产线坐标") +public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = -7823702941907604215L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private String xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private String yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java new file mode 100644 index 0000000..d8e07a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_MATRIX") +@Api("MES_看板产线矩阵") +public class MesBoardLineMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 4414374274261870347L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PICTURE_URL") + @ApiParam("产线图片路径") + private String pictureUrl; + + @Column(name = "USER_FIRST") + @ApiParam("用户编号1") + private String userFirst; + + @Column(name = "USER_SECOND") + @ApiParam("用户编号2") + private String userSecond; + + @Column(name = "USER_THIRD") + @ApiParam("用户编号3") + private String userThird; + + @Column(name = "USER_FORTH") + @ApiParam("用户编号4") + private String userForth; + + @Column(name = "USER_FIFTH") + @ApiParam("用户编号5") + private String userFifth; + + @Column(name = "USER_SIXTH") + @ApiParam("用户编号6") + private String userSixth; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java new file mode 100644 index 0000000..ee461b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_STAFF_MATRIX") +@Api("MES_看板产线员工能力矩阵") +public class MesBoardLineStaffMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 1889056360071546259L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private Double xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private Double yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java new file mode 100644 index 0000000..5380410 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/10/27 13:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LINE_FAULT_RECORD") +@Api("产线故障记录表") +public class MesLineFaultRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6108659377329720059L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "FAULT_TIME") + @ApiParam("故障时长（分）") + private Double faultTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java new file mode 100644 index 0000000..29ffebf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : 员工信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STAFF") +@Api("员工信息") +public class MesStaff extends BaseBean implements Serializable { + private static final long serialVersionUID = -8330599945613548761L; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam("姓名") + private String userName; + + @Column(name = "PICTURE_URL") + @ApiParam("照片路径") + private String pictureUrl; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private Integer skillLevel; + + @Transient + private Double xAxis; + + @Transient + private Double yAxis; + + @Transient + private String workCellCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index fce6b31..fa677a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -387,6 +386,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("已报工数量") private Integer productOffLineQty; + @Transient + @ApiParam("生产节拍") + private Integer takt; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -419,10 +423,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public MesWorkOrder(){} + public MesWorkOrder() { + } - public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty, - String partNo,String partNameRdd,String itemPartNo,Double itemQty){ + public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty, + String partNo, String partNameRdd, String itemPartNo, Double itemQty) { this.orderNo = orderNo; this.startTime = startTime; this.workCenterCode = workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java index 50601e8..67ed3eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java index cfe4ed4..6ea1cca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java index 7d1c6f2..be1576f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java similarity index 82% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java index 4c4035b..411faac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java similarity index 95% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java index ef61c84..7b7fdc9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java index d9dd5d5..b1219aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java index e61fa14..e85a236 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java index 8a7070f..45c78ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java index 55efd0e..63d2725 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java index 740b5a0..6916568 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java similarity index 92% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java index fbf4020..9822683 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java new file mode 100644 index 0000000..2c4c39f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 17:30 + * @desc + */ +@Data +public class AndonModel { + + private String workCenterCode; + + private Double xAxis; + + private Double yAxis; + + private String expInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java new file mode 100644 index 0000000..5513e58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class DefectModel { + + private String workCenterCode; + + private Map percents; + + private Integer total; + + private String queryBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java new file mode 100644 index 0000000..3b95ac3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 20:50 + * @desc + */ +@Data +public class GoodRateModel { + + private String workCenterCode; + + private Double goodRate; + + private Integer total; + + private Integer goodTotal; + + private String color; + + private Double passPercentMax; + + private Double passPercentMin; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java new file mode 100644 index 0000000..fcf204f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class OeeModel { + + private String workCenterCode; + + private Integer takt; + + private Integer standardTakt; + + private String color; + + private Double threshold = 0.03; + + private Double realProductivity; + + private Double oeePercent; + + private Double realWorkTime; + + private String shiftBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java new file mode 100644 index 0000000..a3ea101 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 14:10 + * @desc + */ +@Data +public class ProductivityModel { + + private String time; + + private Integer planProductivity; + + private Integer realProductivity; + + private boolean isCurrentInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java new file mode 100644 index 0000000..cb9a30e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/28 21:44 + * @desc + */ +@Data +public class StaffMatrixModel { + + private List workCenterCodes; + + private String currentWorkCenterCode; + + private String workCenterPictureUrl; + + private List staffs; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java new file mode 100644 index 0000000..c259074 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineCoordsMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineCoordsMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java new file mode 100644 index 0000000..b381acf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java new file mode 100644 index 0000000..95ecb83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineStaffMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineStaffMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java new file mode 100644 index 0000000..a367516 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLineFaultRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesLineFaultRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java new file mode 100644 index 0000000..ddd50d4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStaffRepository extends BaseRepository { +} From 20ee1215d2b3ef31798650ee4e2b046dd42085c1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:59:46 +0800 Subject: [PATCH 39/44] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E7=BB=86=E5=8C=96=20=E5=AF=BC=E8=87=B4=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java index 421d7e5..fee720e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java index fa764fa..3b113ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; From 37c95dc6b32b8401b5a405833b4947b8e8ff67c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 10:36:44 +0800 Subject: [PATCH 40/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MgnBoardAssembleCompRateModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index e4e28cb..d4fc145 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -18,4 +18,31 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("合格率偏差值") private String fpyDeviationValue; + @ApiParam("日期") + private String date; + + @ApiParam("目标OEE") + private String planOee; + + @ApiParam("实际OEE") + private String finaOee; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷占比") + private String defectProportion; + + @ApiParam("一次目标良品值") + private Double planFirstPassYield; + + @ApiParam("最终目标良品值") + private Double planPassYield; + + @ApiParam("一次良品率") + private String firstQualifiedRate; + + @ApiParam("最终良品率") + private String finalQualifiedRate; + } From 87611856dd3a3344a827bad3d5de6bae95be8c48 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Oct 2020 13:11:34 +0800 Subject: [PATCH 41/44] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=A4=9A=E7=BA=A7BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index 8bddf7e..d382a00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -173,6 +173,10 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; + @Column(name = "CYCLE_IQC") + @ApiParam(value = "周期内免检", example = "1") + private Integer cycleIqc; + public Integer getQcPassCount() { return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); } From 5487c165ff9ec0abebba8e04d31e8a8682ae4349 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 13:22:50 +0800 Subject: [PATCH 42/44] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 49 ++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java | 100 +++++++++++++++++++++ .../pojo/wms/repository/WmsPlcRepository.java | 16 ++++ 3 files changed, 165 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index cdd8873..c6deb39 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9243,4 +9243,53 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * PLC业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + DR(10, "DR", "DR"), + DF(20, "DF", "DF"), + IP(30, "IP", "IP"); + + private int value; + private String code; + private String description; + + PLC_BUSI_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } + + + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java new file mode 100644 index 0000000..b2d9ee2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 9:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PLC") +@Api("WMSPLC配置表") +public class WmsPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PLC_BUSI_TYPE.class) + private Integer busiType; + + @Column(name = "OPC_URL") + @ApiParam("OPC路径") + private String opcUrl; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + /*@Column(name = "DATA_TYPE") + @ApiParam("标签类别") + private Integer dataType;*/ + + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam("密码") + private String password; + + @Column(name = "START_VALUE") + @ApiParam("开始节点") + private Integer startValue; + + @Column(name = "end_VALUE") + @ApiParam("结束节点") + private Integer endValue; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + + @Column(name = "REQUEST_INTERVAL") + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java new file mode 100644 index 0000000..da8fa53 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPlc; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 10:47 + * @Modify: + **/ +@Repository +public interface WmsPlcRepository extends BaseRepository { +} From 3dc951c34f804b70e50484d303264e74e501ec5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 29 Oct 2020 14:38:23 +0800 Subject: [PATCH 43/44] =?UTF-8?q?=E3=80=9011964=2019048-=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E6=8A=9B=E5=85=89=E6=8A=A5=E8=A1=A8=E5=8F=98=E6=9B=B4-20201021?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../mes/model/MgnPaintPolishingReportModel.java | 3 + 2 files changed, 80 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a0e0dde..8ca0b5a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7972,4 +7972,81 @@ public class MesEnumUtil { } } + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java index 5f7725a..99ff6fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel { @ApiParam("组织代码") private String organizeCode; + @ApiParam("不良处理类型") + private String defectActionType; + } From 692cd283f714480bf5a0bac6467992f02b46f25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 16:27:05 +0800 Subject: [PATCH 44/44] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/TjMgnBoardEquipmentMonitorModel.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java new file mode 100644 index 0000000..d19a7bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class TjMgnBoardEquipmentMonitorModel { + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("横坐标") + private Double xAxes = 0d; + + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @ApiParam("工位状态") + private String workCellStatus; + + @ApiParam("颜色") + private String color; +}