From 7ef04dd8243b706e6533d14d822c018af740ed30 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:35:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 617148e..db31037 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 @@ -501,7 +501,8 @@ public class WmsEnumUtil { LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), - TRANSIT_LOCATE(80, "T", "在途库"); + TRANSIT_LOCATE(80, "T", "在途库"), + UTENSIL_LOCATE(90, "U", "器具库"); private int value; private String code; @@ -2987,7 +2988,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), + UTENSIL(50, "器具"); private int value; private String description; From 69e20029e857bf80b9c2e64804f0d05a7498e64d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:37:45 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?90=3D=E5=99=A8=E5=85=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.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/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 590f11c..d5344c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库 */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") From a2ac02aa47e916fc9a18dbfc5623c5c382a00ba6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 19:27:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 3 files changed, 6 insertions(+), 2 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 db31037..5097556 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 @@ -1351,7 +1351,7 @@ public class WmsEnumUtil { FROZEN(30, "已冻结"), THAWING(40, "已解冻"), RETURN_GOODS(50, "取消冻结"), - Unsettled_(60, "取消冻结"); + UNSETTLED_NCUNFREEZE(60, "未盘解冻"); private int value; private String description; 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 878db14..8590f92 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 @@ -136,6 +136,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("存储区编号组") public String[] zoneNos; + @Transient + @ApiParam("行号") + private String item; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 21af5a3..947cb55 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60=未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 4c8a94bdfaf1919ec3ab30e226ef1dc7d6742770 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 23:17:30 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1f4fc92..6c68ff3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1359,6 +1359,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); From 1d7cf4165335a4f0a3c715df3b695bf9284829d3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 20 Dec 2019 02:54:50 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=E3=80=91=E5=90=8E=E6=9C=9F=E5=BE=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 2 ++ 3 files changed, 20 insertions(+) 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 8590f92..14c0486 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 @@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean { public String remark; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源库位编号") public String srcLocateNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源存储区编号") public String srcZoneNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源仓库编号") public String srcWhNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("是否范围内") public Integer isScope; @@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean { public String vendorNo; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; @@ -125,18 +132,22 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") public Integer snStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("存储区编号组") public String[] zoneNos; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("行号") private String item; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 947cb55..c4550f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") + @AnnoOutputColumn(hidden = true) public String item; @Column(name = "QTY", columnDefinition = "decimal(18,8)") @@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean { @Transient @ApiParam(value = "实盘数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double factQty; @Transient @ApiParam(value = "剩余数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double surplusQty; @Transient @ApiParam("目标库位编号") + @AnnoOutputColumn(hidden = true) public String destLocateNo; @Transient @ApiParam("前端表格编辑使用") + @AnnoOutputColumn(hidden = true) public Boolean isSet = false; @Transient @ApiParam("源单位") + @AnnoOutputColumn(hidden = true) public String srcUnit; @Transient @ApiParam("存储区编号") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index 1873977..a85ae4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean { public String partNameRdd; @Column(name="IS_ADJUST") + @AnnoOutputColumn(hidden = true) @ApiParam(value = "调整标识", example = "1") public Integer isAdjust; } From c87b00756f406decf4ffd4635dfdb9bb72fad4d8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 10:29:25 +0800 Subject: [PATCH 06/11] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9po?= =?UTF-8?q?m?= 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/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b0a3f82..c052a9d 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-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 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5345a36..9caeb95 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From 335ab2ce510a062d127026228652b7c7ad95bf37 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Dec 2019 11:03:37 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index e9471e8..7eb002d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定工艺路线") private String specifyRouting; - @Column(name="RESYNCHRONIZE") - @ApiParam(value ="是否同步") - @FieldAnnotation(defaultValue = "true") - private Boolean resynchronize; - @Column(name="RECALC_COUNT") @ApiParam(value ="是否重新计算数量") @FieldAnnotation(defaultValue = "true") From 03eeacd2730511a25cc72f11163f39f4ee3a1fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 20 Dec 2019 11:38:44 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90KT-1298=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E3=80=90=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=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/wms/bean/WmsRoutingRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 15f6d49..bb300a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的库位") private String destLocateNo; + @Column(name = "DEST_MOVE_TYPE") + @ApiParam(value = "目的库位") + private String destMoveType; + public WmsRoutingRule(){} } From b0709aca9737cf42500350adfa3723397776fb10 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 15:05:41 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 a22ef11..75b5626 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 @@ -3565,8 +3565,8 @@ public class MesEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int value; private String code; 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 ecda007..38a41e0 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 @@ -131,8 +131,8 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int value; private String code; From 996526ac7cd17e41fe71e20e0d5856f58aece9e6 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 20 Dec 2019 15:11:40 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90bug7088=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 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 5097556..2e16847 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 @@ -3030,8 +3030,8 @@ public class WmsEnumUtil { public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"); - + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"), + UTENSIL("50", "器具"); private String value; private String description; @@ -3057,6 +3057,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } } From 393d3f12b84845f2cc4ca7d9a77bd66ba9adc446 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Dec 2019 16:44:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=907055=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7=E6=B5=81=E7=A8=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..1f3d722 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam(value = "波次配料物料清单") + boolean collectPicking = false; } 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 312209b..3ac14cc 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 @@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } + public WmsDocMovementDetails (String partNo) { + this.partNo = partNo; + } + + public WmsDocMovementDetails (String partNo,String orderNo) { + this.partNo = partNo; + this.orderNo = orderNo; + } + }