From 67b5069c4845114ffdc3214d3cecddb34820216b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 7 Dec 2019 23:20:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index eee5432..d707fe8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "SRC_WHERE", length = 255) public String srcWhere; + + /** + * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔 + */ + @Column(name = "SRC_GROUP_COLUMNS", length = 255) + public String srcGroupColumns; /** * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 * 例如：SYNFLG=Y,SYNDATE={#XX} From 9b8675c9043e9bce8ee946ed01440cf0263ec466 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 9 Dec 2019 09:38:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?task=20`1292-1`=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B1=A5=E5=8E=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java | 10 +++++++++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index bd8d086..c9bbc09 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -112,7 +112,15 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户零件号") private String custPartNo; - @Column(name="OPERATE_TYPE") + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常（默认），20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; + + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index d3d073b..3da8adb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -112,6 +112,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户零件号") private String custPartNo; + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常（默认），20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; + @Column(name="OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; From c7d4253e5ef07ccc5a79bbd1ebc7d7e8aadb55ed Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Mon, 9 Dec 2019 14:36:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90bug=206872=20-=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=8F=91=E8=BF=90=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=8A=A0=E8=BD=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) 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 385c27e..652aa48 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 @@ -4304,4 +4304,97 @@ public class WmsEnumUtil { } } + /** + * 收货看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RECEIVING_GOODS_STATUS { + WAIT_RECEIVING(10, "待收货"), + RECEIVING(20, "收货中"), + COMPLETE_RECEIVING(30, "收货完成"), + UN_RECEIVED(40, "延迟未收货"), + ELSE(50,"其他"); + + private int value; + private String description; + + RECEIVING_GOODS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static RECEIVING_GOODS_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** + * 发运看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINAL_SHIPMENT_STATUS { + CREATE(10, "新建"), + PROCESSING(20, "处理中"), + COMPLETE(30, "已完成"); + + private int value; + private String description; + + FINAL_SHIPMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static FINAL_SHIPMENT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + } \ No newline at end of file From bba25ad2de59f36566dfcc6a0d700c3ea2e81402 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 Dec 2019 14:52:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8C=85model?= =?UTF-8?q?=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/mes/pcn/model/ProdPackageModel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index fc94a50..ba753cc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -67,9 +66,6 @@ public class ProdPackageModel { @ApiParam("包装集合") private List packageList; - @ApiParam("工单集合") - private List workOrderList; - @ApiParam("打印状态文字") private String printStrStatus;