From 8da671628cd2ed3c9da7e2af091165a97b2c4bb0 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 11:54:00 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=9B=98=E7=82=B9PC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 3 +-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++++- 5 files changed, 26 insertions(+), 4 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 80aec01..80aad67 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 @@ -1833,7 +1833,7 @@ public class WmsEnumUtil { STEP_SEQ("STEP_SEQ", "步骤调用序号"), MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), - ORDER_NO("ORDER_NO", "盘点主表序号"); + CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"); private String code; private String description; 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 c4a8117..a9391f9 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 @@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer snStatus; /** - * 处理状态:1=已创建,5=已盘,10=已冻结 - * ,20=已解冻,30=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 9ab2ff2..f9dfc7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Transient + @ApiParam(value = "盘点物料清单") + public List wmsCSPartList; + + @Transient + @ApiParam(value = "盘点存储区清单") + public List wmsCSZoneList; + + @Transient + @ApiParam(value = "盘点库位清单") + public List wmsCSLocateList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index ab4f8e7..72049d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 盘点存储区信息 @@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean { @Column(name="ZONE_NO") @ApiParam("存储区代码") public String zoneNo; + + @Transient + @ApiParam("库位代码") + public String locateNo; } 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 ef9999f..f2fbd4b 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 @@ -24,6 +24,12 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { + public static String packInParams(String colnumName,String[] params){ + StringBuffer sb = new StringBuffer(); + HqlPack.getInPackString(String.join(",", params),colnumName,sb); + return sb.toString(); + } + /** * 封装公用查询参数 * @param bean 实体对象 @@ -188,7 +194,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); From 738db8d8372f0bcbb4a73ddf8bb6d75e61cdcde9 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 13:30:33 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=A7=92=E8=89=B2=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BE=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 42 ++++++++++++++++++++++ .../pojo/model/platform/UserRolePagerModel.java | 20 +++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 12 +++++++ 3 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java 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 7a99b67..d0a8309 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 @@ -2110,4 +2110,46 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 打印模板 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TEMPLATE { + SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"), + ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"), + RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板"); + + private int value; + private String code; + private String description; + + PRINT_TEMPLATE(int value, String code, String description){ + this.value = value; + this.description = description; + this.code = code; + } + + 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].getDescription(); + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java new file mode 100644 index 0000000..4ca730e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-19 13:52 + * @Modify: + **/ +@Data +public class UserRolePagerModel { + + private SysRole sysRole; + + private Pager pager; +} 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 2cc7367..b78f3e2 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 @@ -1471,4 +1471,16 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransModule, result); return result.toString(); } + /** + * 根据条件查询系统配置信息 + * @param wmsConfig + * @return + */ + public static String packHqlWmsConfig(WmsConfig wmsConfig) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + getStringBuilderPack(wmsConfig, result); + return result.toString(); + } + } From fa4c4cd95716d7b23adefff216b8ee47d0b4bd99 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 15:34:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E7=BC=96?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 9 --------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 2 files changed, 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 8707b77..753b7e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -96,13 +96,4 @@ public class WmsOpType extends BaseBean { @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; - - @Column(name = "TM_ID") - @ApiParam(value = "处理组件编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long tmId; - - @Column(name = "DATA_SRC") - @ApiParam("数据来源") - private String dataSrc; } 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 2cc7367..823b0df 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 @@ -351,7 +351,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result); HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); getStringBuilderPack(wmsOpType, result); From 5c6ab755dded7aee9789998378863ae95961ee7e Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 15:45:22 +0800 Subject: [PATCH 04/11] =?UTF-8?q?userTime=E6=94=B9=E4=B8=BAuserTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.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/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 753b7e2..c889b78 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -91,7 +91,7 @@ public class WmsOpType extends BaseBean { @Column(name = "USE_TIME") @ApiParam(value = "标准工时(每箱)", example = "0") - private Integer userTime; + private Integer useTime; @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") From 8d442fcafa4ef17ddda8ad7dd1e684fb5499458f Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 16:34:00 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index f9dfc7a..05c572c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -68,13 +68,13 @@ public class WmsCSOrderMaster extends BaseBean { @Transient @ApiParam(value = "盘点物料清单") - public List wmsCSPartList; + public String[] wmsCSParts; @Transient @ApiParam(value = "盘点存储区清单") - public List wmsCSZoneList; + public String[] wmsCSZones; @Transient @ApiParam(value = "盘点库位清单") - public List wmsCSLocateList; + public String[] wmsCSLocates; } From ebc92f6290c7dcf349c95eeb9bbc2001333542b0 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 19 Mar 2019 16:49:38 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 99f3f47..a2ddf74 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -100,4 +100,12 @@ public class WmsDocMovementMaster extends BaseBean { @Transient private List movementDetailsList; + + @Transient + @ApiParam(value = "源库存地代码") + private String srcAreaNo; + + @Transient + @ApiParam(value = "目的库存地代码") + private String desrAreaNo; } From 2e020d7be2c4ef4811d468f1b2aa22134f765630 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 19 Mar 2019 17:24:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB?= 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 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 9acb8ee..0d72080 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 @@ -2074,9 +2074,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { - ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), - LOCKING(3, "全部", "fa cell-fa fa-lock"); + YES(1, "是", "fa fa-success cell-fa fa-check"), + NO(2, "否", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String description; From 4ef08afaa7ff22d46e37520ea7cd90ed3934da7f Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 19 Mar 2019 17:40:37 +0800 Subject: [PATCH 08/11] dragon --- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 40 +++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f858769..893a13b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") - @ApiParam(value = "交易数量", example = "1") - private Double qty; - - @Column(name = "REJECT_QTY") - @ApiParam(value = "不合格交易数量", example = "1") - private Double rejectQty; - @Column(name = "TRANS_STATUS") @ApiParam(value = "状态", example = "10") private Integer transStatus; @@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean { @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage; + + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; + + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } From 6cf53459e28a037ff8b23485d0c1d08d08eb1527 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 19 Mar 2019 19:24:41 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= 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 6787a24..f93613e 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 @@ -648,6 +648,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); From 73d2da12edd7f62dfda811c03b069dd74cf2c8f3 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Tue, 19 Mar 2019 20:21:52 +0800 Subject: [PATCH 10/11] =?UTF-8?q?po=E7=89=88=E6=9C=AC=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 | 40 ++++++++++++++++++++++ 1 file changed, 40 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 0d72080..fbbd992 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 @@ -2151,4 +2151,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 版本号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VERSION { + PO_VERSION(10, "VERSION", "PO版本号"); + + private int value; + private String code; + private String description; + + VERSION(int value, String code, String description){ + this.value = value; + this.description = description; + this.code = code; + } + + 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].getDescription(); + } + } + return tmp; + } + } } From bd6f6c05468039f39a41ccc6309b78fcfb32a927 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 19 Mar 2019 21:19:30 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6V2.0=EF=BC=9A=E5=BA=93=E5=AD=98=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=A1=A8=E4=B8=AD=E6=95=B0=E9=87=8F=E7=B1=BB=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B8=8E=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0d72080..431c6cf 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 @@ -2034,7 +2034,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRANS_QUAN_GENERAL_TAG { - MINUS(-1, "MINUS", "一条：负"), ZERO(0, "ZERO", "一条：0"), PLUS(1, "PLUS", "一条：正"), TWO(2, "TWO", "两条：一正一负"); + SRC(-1, "SRC", "一条：负"), ZERO(0, "ZERO", "一条：0"), DEST(1, "DEST", "一条：正"), TWO(2, "TWO", "两条：一正一负"); private String code; private String description;