From fb4b10e6892007ad656c09f09b198389a6e546fa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 14 Jan 2021 17:57:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B6=82=E8=A3=85=E8=B4=A8=E6=A3=80=20?= =?UTF-8?q?=E5=BE=85=E5=AE=9A=20=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/BusiQueueDispatchModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java new file mode 100644 index 0000000..2883a02 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 业务队列model + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class BusiQueueDispatchModel { + + @ApiParam("实现类") + private Object busDispatchervice; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("key") + private String key; + + @ApiParam("数据") + private Object Obj; + + @ApiParam("信息") + private String info; + + @ApiParam("集合") + private List list; + +} From 53b72a8f8de415b4aa9ccc17c6658f0698e8a344 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 14 Jan 2021 18:22:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A8202101141821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index e7bcf70..97085b3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java @@ -19,7 +19,7 @@ public class DefectRecordModel implements Serializable { private static final long serialVersionUID = 4994719388513997046L; @ApiParam("产线") - private String workCenterCode; + private String workCenterName; @ApiParam("工序名称") private String processName; @@ -52,8 +52,8 @@ public class DefectRecordModel implements Serializable { public String createDatetime; - public DefectRecordModel(String workCenterCode, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) { - this.workCenterCode = workCenterCode; + public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) { + this.workCenterName = workCenterName; this.processName = processName; this.qcStatus = qcStatus; this.defectName = defectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index 55a17c9..ce69059 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -16,7 +16,7 @@ import java.io.Serializable; @ApiModel("产品履历报表-产品信息") public class ProductSnModel implements Serializable { - private static final long serialVersionUID = 5217363746963291483L; + private static final long serialVersionUID = 7137684552464509466L; @ApiParam("客户零件号") From 479b81cb0825e5b197d54d8bb6c2ee424187ce67 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 14 Jan 2021 19:11:12 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210114?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index ce69059..378d263 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -53,7 +53,7 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) { + public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { this.customerPartNo = customerPartNo; this.serialNumber = serialNumber; this.partNo = partNo; From 0871833d26b40e06ab39fa5814154f186fbd0331 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Fri, 15 Jan 2021 09:04:54 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java index ce9d922..8878a06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java @@ -36,7 +36,7 @@ public class PackageTravelModel implements Serializable { private String qrCode; @ApiParam("产线") - private String workCenterCode; + private String workCenterName; @ApiParam("工序名称") private String processName; @@ -65,13 +65,13 @@ public class PackageTravelModel implements Serializable { @ApiParam("执行时间") private String createUser; - public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) { + public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) { this.packageNo = packageNo; this.customerPartNo = customerPartNo; this.serialNumber = serialNumber; this.partNo = partNo; this.qrCode = qrCode; - this.workCenterCode = workCenterCode; + this.workCenterName = workCenterName; this.processName = processName; this.ctCode = ctCode; this.ctNo = ctNo; From 8eb1831861233ddf4031e001d317993245b75852 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 Jan 2021 09:38:53 +0800 Subject: [PATCH 5/8] Fix bug#12607 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 +++--- .../pojo/wms/bean/WmsDocMovementDetails.java | 38 ++++++++++++++++++---- 2 files changed, 37 insertions(+), 11 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 91f0f5d..65c5ee9 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 @@ -9163,11 +9163,11 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_BOARD_STATUS { - FINISH(10, "已完成(绿色)"), - OVER_TIME(20, "已超时（红色）"), - UNRECEIVED(30, "未收货（蓝色）"), - VARIANT(40, "有差异（黄色）"), - NORMAL(50, "正常（白色）"); + FINISH(10, "已完成"),//绿色 + OVER_TIME(20, "已超时"),//红色 + UNRECEIVED(30, "未收货"),//蓝色 + VARIANT(40, "有差异"),//黄色 + NORMAL(50, "正常");//白色 private int value; private String description; 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 5ba84cf..b6b0f0b 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 @@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; 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; 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 javax.persistence.Version; /** * @Description :移库单明细实体(用于转储类业务) @@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "目的库位名称") public String destLocateName; + @Transient + @ApiParam("报废类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") + public Integer scrapType; + + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -740,9 +751,9 @@ 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) { + 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; @@ -758,4 +769,19 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.createUser = createUser; this.createDatetime = createDatetime; } + + public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) { + this.orderNo = orderNo; + this.partNo = partNo; + this.custPartNo = custPartNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.qty = qty; + this.pickQty = pickQty; + this.createDatetime = createDatetime; + this.orderStatus = orderStatus; + this.createUser = createUser; + + } } From c45cd70ea91a3790074facd7031873fb52bd7e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 15 Jan 2021 13:31:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=96=9C=E5=BE=B7BUG=EF=BC=9A=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=B1=95=E5=BC=80=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BF=94=E5=9B=9EseqNo=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 1 + 1 file changed, 1 insertion(+) 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 b6b0f0b..c69cab8 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 @@ -768,6 +768,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.orderMasterStatus = orderMasterStatus; this.createUser = createUser; this.createDatetime = createDatetime; + this.seqNo = seqNo; } public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) { From 8cd32346d399b1e7e6cefe69b3439070680b1bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 15 Jan 2021 15:30:43 +0800 Subject: [PATCH 7/8] =?UTF-8?q?BUG#13694,=E5=96=9C=E5=BE=B7BUG=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81=E5=B1=95=E5=BC=80=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9F=A5=E8=AF=A2seqNo=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c69cab8..ed0c231 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 @@ -753,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { 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) { + Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) { this.organizeCode = organizeCode; this.workOrderCode = workOrderCode; this.orderNo = orderNo; From db204080a8670a0ebcc71ff842a9592b55345ad2 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 18 Jan 2021 14:54:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=BB=91=E9=81=93=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E5=AE=A2=E6=88=B7=E4=BB=A3=E5=8F=B7"?= =?UTF-8?q?=E4=B8=8E"=E5=AE=A2=E6=88=B7=E6=8A=AC=E5=A4=B4"=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index ad614a8..39b12bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CFG_CODE") @ApiParam("客户配置代码") private String customerCfgCode; + + @Column(name = "CUSTOMER_MARK") + @ApiParam("客户代号") + private String customerMark; + + @Column(name = "CUSTOMER_LATCH") + @ApiParam("客户抬头") + private String customerLatch; }