From 234aad93e3bc96486aa0a95dd3fee3f0220927f3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 20 Mar 2019 15:47:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=202.=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=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/WmsActionResponseBean.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 2 files changed, 8 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 1730e20..b99f4ec 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 @@ -75,6 +75,12 @@ public class WmsActionResponseBean { public Boolean isDetailsBtnDisabled = true; /** + * 默认为true，如果这个值为true就禁用按钮否则可用， + */ + @ApiParam(value = "输入框是否禁用") + public Boolean isInputBtnDisabled = false; + + /** * 与 toSelected 属性配合使用， * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 */ 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 f93613e..5862925 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 @@ -1405,10 +1405,11 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { + public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); HqlPack.getInPackString(data,columnName,result); + HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); } From b9d00d181e76e2a8c878440a4c040bf1387e6dc1 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Wed, 20 Mar 2019 18:31:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=A1=E7=A0=81=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 | 62 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 2 +- 2 files changed, 63 insertions(+), 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 6a11b45..5baff68 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 @@ -1913,6 +1913,35 @@ public class WmsEnumUtil { } /** + * 通用条码枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMON_SN { + PO_SN("PO_SN", "PO条码"); + + private String code; + private String description; + int value; + + COMMON_SN(String code, String description) { + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** * 可选项类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2191,4 +2220,37 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 包装类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TYPE { + BOX(10 , "BOX", "BOX（盒）"), + CARTON(20 , "CARTON", "CARTON（箱）"), + PALLET(30 , "PALLET", "PALLET（栈板）"), + CONTAINER(40 , "PALLET", "PALLET（集装箱）"); + + private String code; + private String description; + int value; + + PACKAGE_TYPE(int value , String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index b1ae594..e7610a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean { @Column(name="REMARK") @ApiParam("备注") - public String reMark; + public String remark; @Column(name="PASS_QTY") @ApiParam("合格数量")