From fb1756198d570166cfd9b3d60ec457cd008bfb8d Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 15 Nov 2018 19:41:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index 2bba402..18f57bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -77,4 +77,7 @@ public class WmsShopping extends BaseBean { @ApiParam(value ="客户简称") private transient String custName; + + @ApiParam(value = "发往地简称") + private transient String flagName; } 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 2e5b911..044c688 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 @@ -555,6 +555,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + //特殊发货标志 + HqlPack.getNumEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); //是否删除 HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); //工厂 From 73b35ee0aa442e99d9b905eb363ea7f88c0c2bc6 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 15 Nov 2018 19:57:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) 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 c4d6440..6f57676 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 @@ -545,8 +545,6 @@ public class WmsHqlPack { */ public static String packHqlWmsShipping(WmsShopping wmsShopping) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsShopping.getIsValid(), "isValid", result); //发运单号 HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 @@ -557,10 +555,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 HqlPack.getNumEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); - //是否删除 - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - //工厂 - HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result); + getStringBuilderPack(wmsShopping, result); return result.toString(); } @@ -572,8 +567,6 @@ public class WmsHqlPack { */ public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result); //采购单号 HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 @@ -584,10 +577,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); - //是否删除 - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - //工厂 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result); + getStringBuilderPack(wmsCheckFactRecord, result); return result.toString(); } From 3c1d015653458c6cea3b6c318db56b32f0daf303 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 15 Nov 2018 20:46:20 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E6=8F=90=E4=BA=A4?= 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 | 1 - 1 file changed, 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 6680d2c..287fde2 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 @@ -51,7 +51,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "发出库仓库") private String srcWh; - @Column(name = "DEST_WH") @ApiParam(value = "接收库仓库") private String destWh; From 4aadf5adf77b715cf54a6e7db4e292724f13a0de Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 15 Nov 2018 21:26:23 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 6e63f84..7a457dc 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 @@ -53,9 +53,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result); + + getStringBuilderPack(wmsPOMasterDetails, result); return result.toString(); } From 5e9467cd354826bfa37866eaf738d7ee11e645a4 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 15 Nov 2018 21:56:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9D=97?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f57676..eede82c 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 @@ -554,7 +554,7 @@ public class WmsHqlPack { //发运状态 HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 - HqlPack.getNumEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); getStringBuilderPack(wmsShopping, result); return result.toString(); } From 6f524abe28f7765fcaa8e2fd0bc1f79b9fc89371 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 15 Nov 2018 21:57:19 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 326 ++++++++++++++++++++- 1 file changed, 320 insertions(+), 6 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 5cded9b..19cfb3a 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 @@ -146,6 +146,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 主表信息 单据类型 */ @@ -254,7 +255,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_STATUS { - CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败"); + CREATE(1, "创建"), FINISH(2, "完成"), FAIL(3, "失败"); private int value; private String description; @@ -284,17 +285,16 @@ public class WmsEnumUtil { } - /** * 消息队列，队列名称 * 1: success_queue * 2: fail_queue */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_NAME{ + public enum QUEUE_NAME { - SUCCESS_QUEUE(1,"success_queue","成功消息队列"), - FAIL_QUEUE(2,"fail_queue","成功消息队列"); + SUCCESS_QUEUE(1, "success_queue", "成功消息队列"), + FAIL_QUEUE(2, "fail_queue", "成功消息队列"); private int value; private String name; @@ -354,7 +354,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { - CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错"); + CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"); private int value; private String description; @@ -437,4 +437,318 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 外部单据：移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_MOVE_TYPE { + IN_STORE(1, "IN", "入库"), + OUT_STORE(2, "OUT", "出库"), + MOVE_STORE(3, "MOVE", "移库"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_MOVE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 外部单据：移库单业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_BUSI_TYPE { + RECEIVE_GOODS(1, "RC", "收货"), + QUALITY_TESTING(2, "QC", "质检"), + IN_STORE(3, "IN", "入库"), + MIX_RECEIVE(4, "ZI", "杂收"), + MIX_SEND(5, "ZO", "杂发"), + SUPPLIER_RETURN_GOODS(6, "VJ", "供应商退货"), + CUSTOMER_RETURN_GOODS(7, "CJ", "客户退货"), + ORDER_PICKING_PART(8, "WP", "工单领料"), + ORDER_RETURN_PART(9, "WJ", "工单退料"), + MOVE_IN(10, "MI", "移库入库"), + MOVE_OUT(11, "MO", "移库出库"), + SEND(12, "SO", "发运"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_BUSI_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 外部单据：移库单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_STATUS { + CREATE(1, "新建"), + RECEIPT(10, "处理中"), + RECEIPT_FINISH(20, "已完成"), + CLOSED(90, "已关闭"), + CANCELLED(91, "已取消"); + + private int value; + private String description; + + OUT_MOVEMENT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 外部单据：移库单详情单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_DETAILS_UNIT { + CREATE(1, "AA"), + RECEIPT(2, "BB"), + RECEIPT_FINISH(3, "CC"), + CLOSED(4, "DD"), + CANCELLED(5, "EE"); + + private int value; + private String description; + + OUT_MOVEMENT_DETAILS_UNIT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 外部单据：移库单详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_MOVEMENT_DETAILS_STATUS { + NORMAL(1, "N", "正常"), + CANCEL(2, "C", "取消"); + + private int value; + private String code; + private String description; + + OUT_MOVEMENT_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 物料：分类（ABC） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_ABC { + A(1, "A", "正常"), + B(2, "B", "正常"), + C(3, "C", "取消"), + D(4, "D", "取消"), + E(5, "E", "取消"); + + private int value; + private String code; + private String description; + + PART_ABC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From aa506869cdf298576ec59ced64bfd273b951348e Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 16 Nov 2018 09:32:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=BF=AE=E6=94=B9?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2e5b911..57bbce5 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 @@ -521,9 +521,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "asnType", result); if (wmsASNMaster.getAsnStatus() != null) { - HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result); } HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result);