From 4c199ce8bad46531ba0edc3ef6e930bf6e63d3f1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 20 Mar 2020 09:39:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A11470=E3=80=90=201470=2050?= =?UTF-8?q?4=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=94=B6=E8=B4=A7--=E6=96=B0=E5=A2=9E=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BB=84=E4=BB=B6=E3=80=91?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A11467=E3=80=901467=20506=20=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=96=B0=E5=A2=9E=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=BA=93=E4=BD=8D=E7=BB=84=E4=BB=B6=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/WmsLocate.java | 10 ++++++++++ .../estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java | 7 +++++++ 2 files changed, 17 insertions(+) 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 ee6babb..a69e24b 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 @@ -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.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; @@ -47,6 +48,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") private Integer locateType; @@ -192,6 +194,14 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(String locateNo,Integer destBoxQty, Integer y, Integer x, Integer z) { + this.locateNo = locateNo; + this.destBoxQty = destBoxQty; + this.y = y; + this.x = x; + this.z = z; + } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ this.boxQty=boxQty; this.partQty=partQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java index 480fb35..c9fcfd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java @@ -48,4 +48,11 @@ public class GenerateLocateRule { * 物料名称 */ private String partNo; + + /** + * 按照坐标排序 + */ + private boolean orderByAxle; + + } From 98787953ec9e951fe8b60e497a31c5a5bfd95cf2 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 25 Mar 2020 14:25:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90MesPcnEnum=20=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=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/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 371e3aa..3e0e184 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 @@ -202,7 +202,7 @@ 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, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); From 56c1bf8c443a29b649ff5c810c6eff920280354d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 25 Mar 2020 18:33:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=907648=20=E5=9C=A8=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=8D=95=E6=8D=AE=E6=8C=89=E9=92=AE=E3=80=82=E3=80=91?= 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 8b79c72..10e116b 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 @@ -105,7 +105,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /**