From b2e4c2496a179d54849f70b6b171e07169a64476 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 29 Nov 2018 13:51:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c56c29c..246524b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -45,6 +45,6 @@ public class WmsTransType extends BaseBean { @Column(name = "PROG_CODE") @ApiParam(value = "处理程序", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long progCode; + private Long agId; } 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 8e9c428..444215b 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 @@ -242,7 +242,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result); + HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); From 256c2acd411c5d8ee08fad53fe7d30e7bcad3ee0 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 29 Nov 2018 16:30:22 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 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 e6e4f3f..2bfea12 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 @@ -1695,4 +1695,40 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 条码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_TYPE { + ONE_DIMENSIONAL_CODE(10, "一维码"), + QR_CODE(20, "二维码"), + ALL(30, "ALL"); + + private int value; + private String description; + + SN_TYPE(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; + } + } } From c92d9e98e4b98da8472f1dfd8aa2df5958c05a97 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 29 Nov 2018 17:42:13 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9E=9A=E4=B8=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/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 e6e4f3f..67da4d4 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 @@ -1588,7 +1588,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PO_SN_STATUS { - fOUND(10, "创建"), + FOUND(10, "创建"), PRINTED(20, "已打印"), RECEIPTED(30, "已收货"); From 8e6bc17a45d9df0596f8f26c207cc222083f3e44 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 17:47:32 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 52bdb57..84c8eb8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; +import java.util.Set; /** * @Description : PDA传输到后台的实体bean对象 @@ -35,10 +36,10 @@ public class WmsActionResponseBean { public String message; @ApiParam("列表信息") - public List informations; + public Set informations; @ApiParam("可选项") - public List options; + public Set options; @ApiParam("选中的明细数据") public List> details; @@ -51,7 +52,7 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { + public WmsActionResponseBean(Double percent, String message, Set informations, List> details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; From e1d0e75c7425432eae4b230f683648509eb3dec7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 18:44:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 942e6a8..d3cf503 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -50,4 +50,8 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public transient String amDesc; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型") + public transient Integer amType; } 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 444215b..ee2fc46 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 @@ -240,7 +240,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); @@ -1000,8 +1000,10 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); getStringBuilderPack(wmsActionStepCall, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); return result.toString(); @@ -1116,6 +1118,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); From 61b16569a450165437bccc8db0e0e3a0402e83d2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 20:14:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 84c8eb8..1c12e54 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -39,7 +39,7 @@ public class WmsActionResponseBean { public Set informations; @ApiParam("可选项") - public Set options; + public Map options; @ApiParam("选中的明细数据") public List> details; 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 ee2fc46..a3d543b 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 @@ -1158,6 +1158,8 @@ public class WmsHqlPack { //作业流程id（对应作业记录明细里自增的id） HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + getStringBuilderPack(wmsActionLogDetails, result); return result.toString(); From 69f4a95394c73c78fb9df9bf20e0acc9996ec838 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 29 Nov 2018 21:32:07 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=B7=B2?= =?UTF-8?q?=E6=94=B6=E6=95=B0=E9=87=8F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index ccc7391..7cfe650 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -105,4 +105,8 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name="VENDOR_LOT_NO") @ApiParam("供应商批次") public String vendorLotNo; + + @Column(name="REC_QTY") + @ApiParam(value = "已收数量", example = "0") + public double recQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d462e18..4dffeea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -70,4 +70,8 @@ public class WmsMoveSn extends BaseBean { @Column(name="PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; + + @Column(name="QTY") + @ApiParam(value = "已收数量", example = "0") + public double qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 48b189c..006bf1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -75,4 +75,8 @@ public class WmsPoSn extends BaseBean { @Column(name="GROUP_NO") @ApiParam("组条码") public String groupNo; + + @Column(name="REC_QTY") + @ApiParam(value = "已收数量", example = "0") + public double recQty; } From cb395f077ed08d4ef9197ff9dddca99c5a12996c Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 21:38:53 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index f492d9d..68219ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -25,6 +25,12 @@ public class WmsOperationBean extends BaseBean { @ApiParam("可选项的值") public List options; + @ApiParam("设备编号") + public String fixNo; + + @ApiParam("作业记录编号") + public String alId; + /** * 触发源:10=扫描枪, * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) From 0aac978b99f5d24e5466c6dc344664bc294f883e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 29 Nov 2018 21:59:22 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysRefUserMessage.java | 2 +- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 0b0d0aa..1a8098c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="SYS_REF_USER_MESSAGE") -@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器") +@Api(value="关系-用户消息",description = "关系-用户消息") public class SysRefUserMessage extends BaseBean { @Column(name="MESSAGE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 603a79a..621d45d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -339,6 +339,22 @@ public class CoreHqlPack { } /** + * 查询字典值是否重复 + * @param dictionary + * @return + */ + public static String packHqlSysDictionaryValue(SysDictionary dictionary){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + // not + HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + + return result.toString(); + } + + /** * 用户信息 复杂查询拼接 * @param userInfo * @return