From b688f4aff5e4ca808329a5eede6bd24efbc5ef26 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 6 Apr 2021 17:26:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=9014905=2020027-=E8=B0=83=E8=A7=92?= =?UTF-8?q?=E5=99=A8BH-=E5=BD=95=E5=85=A5=E6=A3=80=E6=B5=8B=E5=80=BC-=20?= =?UTF-8?q?=E7=86=94=E6=B7=B1=E7=BB=93=E6=9E=9C=E5=88=B7=E6=96=B0=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=20-20210404=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 4 ++ .../i3plus/pojo/wms/modelbean/WmsBatchModel.java | 46 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java 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 3c36fe5..ae4fa00 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 @@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean { @ApiParam("操作类型") private List transTypeLst; + public int getIsOkVal() { + return this.isOk == null ? 0 : this.isOk; + } + public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) { this.organizeCode = wmsSerialSn.getOrganizeCode(); this.batchNo = wmsSerialSn.getBatchNo(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java new file mode 100644 index 0000000..5d6f4d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; +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 : Batch数据模型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2021-04-05 14:53 + * @Modify: + **/ +@Data +@Api("Batch数据模型") +public class WmsBatchModel { + + @ApiParam("二维条码集合") + private List wmsSerialSns; + + @ApiParam("条码集合") + private List wmsStockSnList; + + @ApiParam("Batch号") + private String bhCode; + + @ApiParam("上一个熔深Batch号") + private String firstSnBatch; + + @ApiParam("新事务单号") + private String moveNo; + + @ApiParam("是否正常件") + private boolean flag; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("操作人") + private String userName; + +} From 6ffd5862749c26418e5a1cb6f2e1c5f6e913908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 6 Apr 2021 18:04:37 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=9014903=2019108+=20PCN=E3=80=90?= =?UTF-8?q?=E4=B8=8A=E8=A3=85=E5=B7=A5=E4=BD=8D=E3=80=91=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20+2021-04-03=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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 d4d2787..7072531 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 @@ -6625,4 +6625,32 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum THA_MONITOR_STATUS { + MONITORING(10, "MONITORING", "监听中"), + MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成"); + + private int value; + private String code; + private String description; + + THA_MONITOR_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } From 63dc4a2f9f71995cdc84cc1894fbe821c2c4617e Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Wed, 7 Apr 2021 13:39:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 150116a..5d03e6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Map; /** * @Description :检测结果汇总表 @@ -97,9 +98,23 @@ public class WmsTestResultSummary extends BaseBean { private String sn; @Transient + @ApiParam("库存条码") + private Map bhTypes; + + @Transient @ApiParam("库存条码二维码") private String serialSn; + @Transient + @ApiParam("是否合格最大值") + private Integer maxQualified; + + + @Transient + @ApiParam("是否合格最小值") + private Integer minQualified; + + public WmsTestResultSummary(String organizeCode, String bhCode, String workCenterCode, String partNo, String partName, String flagNo, Integer isQualified, @@ -135,6 +150,14 @@ public class WmsTestResultSummary extends BaseBean { this.bhType = bhType; } + public WmsTestResultSummary(Integer bhType, Integer maxQualified, Integer minQualified, String workCenterCode, String partNo) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.bhType = bhType; + this.maxQualified = maxQualified; + this.minQualified = minQualified; + } + public WmsTestResultSummary() { } } From 6030c6702134a14548b9c05dfaa0af1bc173ac43 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 7 Apr 2021 14:35:59 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index db0a2af..14fbae8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -4,14 +4,14 @@ 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.DynamicInsert; 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; /** @@ -59,4 +59,11 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="VENDOR_NO") @ApiParam("供应商编码") private String vendorNo; + + public WmsPrintingQueue() { + } + + public WmsPrintingQueue(Long id) { + this.id = id; + } } \ No newline at end of file From be26c0920f4e8cf1e3634a6c01e397cac57194e2 Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Wed, 7 Apr 2021 18:01:18 +0800 Subject: [PATCH 5/8] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 5d03e6d..5327553 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -98,8 +98,8 @@ public class WmsTestResultSummary extends BaseBean { private String sn; @Transient - @ApiParam("库存条码") - private Map bhTypes; + @ApiParam("BH号集合") + private Map bhTypes; @Transient @ApiParam("库存条码二维码") From 48546737542e1c2d800209c55a8590a742a17147 Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Thu, 8 Apr 2021 17:46:38 +0800 Subject: [PATCH 6/8] =?UTF-8?q?14850=2020027-mes=E6=9F=A5=E8=AF=A2=20wms?= =?UTF-8?q?=E7=9A=84=E7=86=94=E6=B7=B1batch=E7=9A=84=E6=8E=A5=E5=8F=A3-202?= =?UTF-8?q?10409?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 5327553..60b5370 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -16,6 +16,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; import java.util.Map; /** @@ -106,6 +107,10 @@ public class WmsTestResultSummary extends BaseBean { private String serialSn; @Transient + @ApiParam("返回给mes") + private List wmsForMes; + + @Transient @ApiParam("是否合格最大值") private Integer maxQualified; From 77f66de188d0509688018a0b7e5a13023bd03c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 9 Apr 2021 17:18:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=9014930=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E7=94=9F=E4=BA=A7=E5=8C=85=E8=A3=85=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?-20210409=E3=80=91=20=E3=80=9014884=2020027--=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=BC=96=E8=BE=91=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=81=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E3=80=82-2021-04-06=E3=80=91=20?= =?UTF-8?q?=E3=80=9014848=2020027--=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E8=BE=93=E5=85=A5=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C-2021-04-02=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 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java | 3 +++ 2 files changed, 7 insertions(+) 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 89307ed..d0ed327 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 @@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工序名称") private String processName; + @Transient + @ApiParam("产品条码") + private String productSn; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java index 4dab68a..d3f4b25 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -40,6 +40,9 @@ public class MesControlPlanModel { @ApiParam("是否启用") private Integer isEnable; + @ApiParam("是否删除") + private Integer isCutOut; + @ApiParam("质量标准数组") private List standardList; From 39b716d2a1356ef3a5e9ab1507ecc725c3829fea Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Apr 2021 14:47:32 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 14fbae8..19ed55a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -63,7 +63,7 @@ public class WmsPrintingQueue extends BaseBean{ public WmsPrintingQueue() { } - public WmsPrintingQueue(Long id) { - this.id = id; + public WmsPrintingQueue(String printIdentification) { + this.printIdentification = printIdentification; } } \ No newline at end of file