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 1/3] =?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 2/3] =?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 3/3] =?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")