From baed7db4ed649f4aac284fd54b2f4bcafebd1153 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 15:00:10 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=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 004fb69..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-DEV-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 650ee5b..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-DEV-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 15ad445..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-DEV-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 1e17935..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-DEV-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 37b8a51..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-DEV-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 dc13374..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-DEV-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 6df1cc2..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-DEV-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 123fdc9..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-DEV-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 fdcf6e3..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-DEV-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 d266163..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-DEV-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 60d9861..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-DEV-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 54c8306..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-DEV-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 190efa7..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-DEV-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 5896851..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-DEV-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 aa3dd42..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-DEV-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 80498fc..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-DEV-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 076f15a..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-DEV-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 1351ed3..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-DEV-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 67b0bff..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-DEV-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 15d36cd..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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e57acaf..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..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-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 7fcdae795cd2d36766e4fcb53cf303cfa14a7fc0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 15:57:36 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 10c0680..aa83a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Lob; import javax.persistence.Table; import javax.persistence.Transient; @@ -214,6 +214,29 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster() { } + + public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty, + Integer busiTypeCode, String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.unit = unit; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.handledQty = handledQty; + this.rejectQty = rejectQty; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.refSrc = refSrc; + } + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, From f63baa9c1aa6f891a60de9b3d44f34307abf2e14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Dec 2020 17:21:56 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=20=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=A2=9E=E5=8A=A0=20=E6=A8=A1=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 969ad3f..5e86d59 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 @@ -89,8 +89,9 @@ public class AndonEnumUtil { QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), - OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"), FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"), ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); @@ -1218,7 +1219,8 @@ public class AndonEnumUtil { PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), - FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); + FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"), + MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE"); private String value; private Integer code; From 4e0cab2f6aaeaf3479fa94e9dd657ec831fedf17 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:27:43 +0800 Subject: [PATCH 04/21] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsGcdcContainerModel.java | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java new file mode 100644 index 0000000..5a4bd32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -0,0 +1,169 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : GCDC集装箱model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-11-24 18:17 + * @Modify: + **/ +@Data +@Api("GCDC集装箱model") +public class WmsGcdcContainerModel extends BaseBean { + + @ApiParam("移库单号号") + public String orderNo; + + @ApiParam("库存移动单号") + public String moveNo; + + @ApiParam("条码") + public String sn; + + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @ApiParam(value = "客户编号") + private String custNo; + + @ApiParam(value = "单据状态") + public Integer orderStatus; + + @ApiParam(value = "库存移动单状态") + public Integer itemStatus; + + @ApiParam(value = "包装编号") + private String packageNo; + + @ApiParam("集装箱号") + private String containerNo; + + @ApiParam("产地") + private String productPlace; + + @ApiParam("托盘重量") + private Double packageWeight; + + @ApiParam(value = "客户名称") + public String custNameRdd; + + @ApiParam(value = "业务类型") + public Integer busiType; + + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam(value = "物料号") + public String partNo; + + @ApiParam(value = "物料号") + public String partNameRdd; + + @ApiParam(value = "客户地址") + private String custAddr; + + @ApiParam(value = "客户联系人") + private String custOwner; + + @ApiParam(value = "客户电话号码") + private String custTel; + + @ApiParam(value = "是否集装箱号") + private Integer isContainer; + + @ApiParam("移库单号集合") + private List orderNoList; + + @ApiParam("库存移动单号集合") + private List moveNoList; + + @ApiParam("库存移动单条码集合") + private List moveSnList; + + @ApiParam("库存条码集合") + private List stockSnList; + + @ApiParam(value = "打印队列物料库存集合") + private List wmsPartStockModels; + + @ApiParam(value = "仓库代码") + private String whNo; + + @ApiParam(value = "存储区编号") + private String zoneNo; + + @ApiParam(value = "库位代码") + private String locateNo; + + @ApiParam(value = "客户发往地名称") + private String flagName; + + @ApiParam(value = "客户发往地代码") + private String flagNo; + + @ApiParam(value = "是否绑定发运") + private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + public WmsGcdcContainerModel() { + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer orderStatus, String createDatetime, String createUser) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.orderStatus = orderStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo, + Integer itemStatus, String createDatetime, String createUser, Integer busiType) { + this.id = id; + this.orderNo = orderNo; + this.moveNo = moveNo; + this.erpSrcNo = erpSrcNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.busiType = busiType; + } + + public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) { + this.id = id; + this.orderNo = orderNo; + this.packageNo = packageNo; + this.packageWeight = packageWeight; + this.custNo = custNo; + this.partNo = partNo; + this.flagNo = flagNo; + } + + public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo, + String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) { + this.id = id; + this.organizeCode = organizeCode; + this.packageWeight = packageWeight; + this.packageNo = packageNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.custNo = custNo; + this.flagNo = flagNo; + } +} From 87dcbd64f82d4d527d57509258103abf861bb7a9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:28:23 +0800 Subject: [PATCH 05/21] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java index 5a4bd32..3b23ea7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -93,9 +93,6 @@ public class WmsGcdcContainerModel extends BaseBean { @ApiParam("库存条码集合") private List stockSnList; - @ApiParam(value = "打印队列物料库存集合") - private List wmsPartStockModels; - @ApiParam(value = "仓库代码") private String whNo; From 2ccee2523aab5dc22dda150ee83c1cb5718a063c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Dec 2020 14:40:14 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++ .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ++++++++++++++++++++++ .../MesWorkCellJumpRecordRepository.java | 16 +++++++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 b2c21d4..0c83988 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 @@ -6068,4 +6068,32 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * MesWorkCellJumpRecord 跳过类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_JUMP_TYPE { + + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"), + OTHER(40, "其他"); + + private int value; + private String description; + + MES_WORK_CELL_JUMP_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java new file mode 100644 index 0000000..de9d7e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java @@ -0,0 +1,52 @@ +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.*; +import java.io.Serializable; + +/** + * @Description :工位操作跳过记录表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_WORK_CELL_JUMP_RECORD") +@Api("mes工位操作跳过记录表") +public class MesWorkCellJumpRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1017369816822438021L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "JUMP_TYPE") + @ApiParam("跳过类型 10=过程条码") + private Integer jumpType; + + @Column(name = "JUMP_VALUE") + @ApiParam("跳过值") + private String jumpValue; + + @Column(name = "JUMP_DESC") + @ApiParam("跳过描述") + private String jumpDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java new file mode 100644 index 0000000..6a3f7a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.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.MesWorkCellJumpRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellJumpRecordRepository extends BaseRepository { +} From f21076733205388e0a8ed8784ca05818936eb281 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 24 Dec 2020 15:20:05 +0800 Subject: [PATCH 07/21] =?UTF-8?q?BUG=20#13415=2019058-=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=94=9F=E6=88=90=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=9C=80=E8=A6=81=E6=8A=8A=E5=8E=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index e0654fb..0f4a349 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; import java.util.List; /** @@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("调拨单录入字段") private String defectiveAllocation; + //关联单号 + @Column(name="ORDER_NO") + @ApiParam("关联单号") + private String orderNo; + // @Transient // @ApiParam("打印模板列表") // private String defectiveAllocation; From 7e400a1a6878d0a95b1576b4ddf6ff1ab296d43d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Dec 2020 19:24:21 +0800 Subject: [PATCH 08/21] Fix bug#13399 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 21 ++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 7 +++- 3 files changed, 68 insertions(+), 5 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 90446fd..d487780 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 @@ -9494,6 +9494,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 报废类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"), + AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废"); + + private int value; + private String code; + private String description; + + SCRAP_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/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 077a83c..295096f 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 @@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import lombok.ToString; 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.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean { isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") private String fourthRemake; + + /** + * + */ + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + + @Column(name = "IS_REMOVE_ORDER") @ApiParam(value = "是否撤销单据") private Integer isRemoveOrder = CommonEnumUtil.FALSE; 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 ca32ae5..c16b143 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 @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** @@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotControl; + /** + * 单位：天 + */ @Column(name = "RANGE_LOT") @ApiParam(value = "批次容差") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) From 04f1da7f3f5a04087f13f255e8687c1072e9a3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Dec 2020 10:37:05 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E3=80=903057=20=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E6=8A=A5=E8=A1=A8=20-=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..ff0bbdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam(value = "生产线名称") private String workCenterName; + @Transient + @ApiParam("工序名称") + private String processName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1c1a2b0..0dacf19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3692,7 +3692,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean); DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); return packBean; From b20fc8e55236145a682b5a2cb2dfecd86b493b14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java 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 0c83988..c03278f 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 @@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), REDO_STATION(50, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description :工位操作跳过记录表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2020-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL_JUMP_RECORD") -@Api("mes工位操作跳过记录表") -public class MesWorkCellJumpRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "JUMP_TYPE") - @ApiParam("跳过类型 10=过程条码") - private Integer jumpType; - - @Column(name = "JUMP_VALUE") - @ApiParam("跳过值") - private String jumpValue; - - @Column(name = "JUMP_DESC") - @ApiParam("跳过描述") - private String jumpDesc; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -} From 819a4312ae274d2519a144c9748aa01ca6971c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Dec 2020 13:37:31 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E5=96=9C=E5=BE=B7WMS=EF=BC=9ABUG#13293?= =?UTF-8?q?=EF=BC=8C13295=EF=BC=8C13294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7d27d82..5ba84cf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -740,4 +740,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.destLocateName = locateName; } + public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType, + String item, String partNo, String partNameRdd,String unit, Double qty, + Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) { + this.organizeCode = organizeCode; + this.workOrderCode = workOrderCode; + this.orderNo = orderNo; + this.moveType = moveType; + this.busiType = busiType; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.isSn = isSn; + this.orderMasterStatus = orderMasterStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } } From 7880fc96c9ea90e57038ab30e4d6b916760e3758 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Dec 2020 20:30:43 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1861799..58c5249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -156,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("行号") private String item; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { From 56630ccb0d3dc5ef09d27b4a5d61ad92165a14fd Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 27 Dec 2020 21:25:31 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E9=9D=99=E6=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 995ee1c..30d651d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -366,12 +366,13 @@ public class WmsPart extends BaseBean { this.partSpec = partSpec; } - public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) { + public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, String stockUnit, Integer snControl, Double qty) { this.partNo = partNo; this.partName = partName; this.partSpec = partSpec; this.snp = snp; this.buyUnit = buyUnit; + this.stockUnit = stockUnit; this.snControl = snControl; this.qty = qty; } From 3a98640d5dfc9c4a687a11025170d0ec3e334154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 10:26:04 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E3=80=903063=20=E4=B8=8D=E8=89=AF?= =?UTF-8?q?=E5=93=81=E5=A4=84=E7=90=86=E6=A8=A1=E5=9D=97-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=20--=E5=90=8E=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0dacf19..1346c2f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3699,4 +3699,12 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture) { + DdlPackBean packBean = getAllBaseData(mesProduceCtgyPicture.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getDefectLocation(), "defectLocation", packBean); + DdlPreparedPack.getNumEqualPack(mesProduceCtgyPicture.getIsValid(), "isValid", packBean); + return packBean; + } + } From cafac4312b4bce5ffe8ba775e2a04a35bce24594 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 28 Dec 2020 12:10:53 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 8 ++++---- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 7358782..0c41f5c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -60,12 +60,12 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("数据查询类型") private Integer dataType = 1; - @Column(name = "LIMIT_TIMES") - @ApiParam("限定检测次数") - private Integer limitTimes; + @Column(name = "LIMIT_SPEL_EXPRESS") + @ApiParam("限定检测表达式") + private String limitSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式描述") + @ApiParam("合格标准描述") private String recordNumDesc; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 09972c9..0f07531 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,9 +22,6 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; - @ApiParam("限定次数") - private String limitTimes; - @ApiParam("检测次数") private String checkTimes; From 9a8515eeb944b22dd77abbdb571dfe349df1eadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 28 Dec 2020 15:38:10 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E3=80=9013470=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E5=B7=A5=E4=BD=8D=E5=90=88=E6=A0=BC=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96----2020-12-28=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 73a1815..5ead779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -25,4 +25,6 @@ public class ProductBiSeriesModel { private List snQtyList = new ArrayList<>(); @ApiParam("计划数量集合") private List planQtyList = new ArrayList<>(); + @ApiParam("零件号") + private String partNo; } From 6bd2d191a3815e7b1479e05b8632065c066cc49e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 28 Dec 2020 15:42:53 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=8E=87=E8=B6=8B=E5=8A=BF=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/ScrapRateTrendQueryModel.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/TimeCountModel.java | 20 +++++++++++ .../estsh/i3plus/pojo/mes/model/TimeRateModel.java | 20 +++++++++++ 3 files changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java new file mode 100644 index 0000000..f739965 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScrapRateTrendQueryModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 卡斯马报废率趋势查询条件封装类 + * @Reference : + * @Author : dominic + * @CreateDate : 2020-12-24 16:35 + * @Modify: + **/ +@Data +@Api("报废率趋势查询条件封装类") +public class ScrapRateTrendQueryModel { + + @ApiParam("组织机构代码") + private String organizeCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("开始时间") + private String startTime; + + @ApiParam("结束时间") + private String endTime; + + @ApiParam("时间类型") + private String timeType; + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java new file mode 100644 index 0000000..4010f84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeCountModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间计数 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 10:10 + * @Modify: + **/ +@Data +public class TimeCountModel { + @ApiParam("时间段") + private String time; + + @ApiParam("计数") + private Integer count; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java new file mode 100644 index 0000000..a4c2550 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeRateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 时间比率 + * @Reference : + * @Author : dominic + * @CreateDate : 2020/12/28 13:10 + * @Modify: + **/ +@Data +public class TimeRateModel { + @ApiParam("时间段") + private String time; + + @ApiParam("比率") + private double rate; +} From a86a189fc37633577b6937f19f114bf65b858c10 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 12:04:15 +0800 Subject: [PATCH 18/21] =?UTF-8?q?13493=2020027-=E6=8E=A7=E5=88=B6=E8=AE=A1?= =?UTF-8?q?=E5=88=92--=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96--2020-12?= =?UTF-8?q?-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 18 ++++++++++++++++++ 1 file changed, 18 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 92f4263..e839cc7 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 @@ -2813,6 +2813,15 @@ public class MesEnumUtil { } return tmp; } + + public static MES_QC_CHECK_TYPE getByValue(int value) { + for (MES_QC_CHECK_TYPE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** @@ -7705,6 +7714,15 @@ public class MesEnumUtil { } return tmp; } + + public static QC_CHECK_DATA_SOURCE getByValue(int value) { + for (QC_CHECK_DATA_SOURCE type : values()) { + if (type.getValue() == value) { + return type; + } + } + return null; + } } /** From 6bfc2f92b0dd2f3ffbb17d590956f0dfd029edb1 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 29 Dec 2020 16:59:49 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=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/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d487780..16afd40 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 @@ -871,7 +871,8 @@ public class WmsEnumUtil { OTHER_OUT(740, "OTHER_OUT", "其它出库"), COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), - COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR + PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR private int value; private String code; From 0ee41dbda1a86046914f32202bbb4576efd76a15 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 29 Dec 2020 17:02:37 +0800 Subject: [PATCH 20/21] =?UTF-8?q?13500=2020027--=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E7=BB=8F=E7=90=86BI---=E4=BA=A7=E5=93=81=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C--=E5=A6=82=E5=9B=BE=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E6=98=AF=E5=AE=8C=E6=88=90=E7=9A=84=EF=BC=8C=E4=BD=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A6=96=E6=A3=80=E3=80=81=E6=9C=AB=E6=A3=80=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=A6=96=E6=A3=80=E6=98=AF?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=88=E6=A0=BC=E7=9A=84=EF=BC=8C=E6=9C=AB?= =?UTF-8?q?=E6=A3=80=E6=98=AF=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84---2020-1?= =?UTF-8?q?2-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 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 e839cc7..d42b6e7 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 @@ -8197,4 +8197,50 @@ public class MesEnumUtil { } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PROCESS_CHECK_RESULT_TYPE { + YELLOW(5, "进行中"), + GREEN(10, "合格"), + RED(20, "不合格"); + + private int value; + private String description; + + PRODUCT_PROCESS_CHECK_RESULT_TYPE(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 MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE getByValue(Integer value) { + for (MesEnumUtil.PRODUCT_PROCESS_CHECK_RESULT_TYPE showSupplierCode : values()) { + if (showSupplierCode.getValue() == value) { + return showSupplierCode; + } + } + return null; + } + + 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; + } + } } From 0cec15c1bad57df51a22cb307161910ad61e4768 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Dec 2020 17:36:30 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=E7=82=89=E5=AD=90=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=94=B1=E4=B8=8E=E4=BD=8D=E7=BD=AE=E7=BB=91=E5=AE=9A=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java | 4 ---- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index dd6e895..e5c4ae0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -42,10 +42,6 @@ public class MesFurnaceLocation extends BaseBean implements Serializable { @ApiParam("炉内位置代码") private String fnLocationNo; - @Column(name = "MODEL_IMG_URL") - @ApiParam("模式图片路径") - private String modelImgUrl; - @Column(name = "SEQ") @ApiParam("推荐顺序") private Integer seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java index 8053275..560d696 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -40,4 +40,8 @@ public class MesPartFurnace extends BaseBean implements Serializable { @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1346c2f..821f273 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2784,7 +2784,8 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode()); + ; if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); } @@ -3627,11 +3628,11 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { - DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); - DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); - DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + public static DdlPackBean getPartFurnace(MesPartFurnace partFurnace) { + DdlPackBean packBean = getAllBaseData(partFurnace.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(partFurnace.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partFurnace.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(partFurnace.getIsValid(), "isValid", packBean); return packBean; }