From 47d31872321991c28a3f51946998bb1836319157 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 11 Dec 2018 11:02:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.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/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 6e95f51..c04edf2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -33,15 +33,6 @@ public class WmsMoveMaster extends BaseBean { public String orderNo; /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运1 - */ - @Column(name="ORDER_TYPE") - @ApiParam(value = "业务类型", example = "0") - public Integer orderType; - - /** * 状态:0=创建,5=待处理,10=已处理 */ @Column(name="ORDER_STATUS") 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 02b81b0..c18ba4e 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 @@ -828,7 +828,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); From 4e002cda14e12cbc5b1550edcc6609c935591427 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 11 Dec 2018 13:44:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= 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, 2 insertions(+) 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 02b81b0..c6760ff 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 @@ -1110,6 +1110,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionGroupDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); } From 09a88efc88f10d3fc6a3c2db36ed44042e750fbf Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 11 Dec 2018 16:06:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=80=E5=8F=91po=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 02b81b0..b983943 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 @@ -1190,4 +1190,23 @@ public class WmsHqlPack { return result.toString(); } + + /** + * PO订单条码表 分页查询 + * + * @param wmsPoSn + * @return + */ + public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsPoSn.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsPoSn.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsPoSn, result); + + return result.toString(); + } } From 628c0c86dddaed47b12c5d5bf45f6f9b182b3ce8 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 11 Dec 2018 16:46:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.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/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c466a30..1752fae 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 @@ -78,6 +78,6 @@ public class WmsPoSn extends BaseBean { public String groupNo; @Column(name="REC_QTY") - @ApiParam(value = "已收数量", example = "0") + @ApiParam(value = "收货数量", example = "0") public Double recQty; } From b597df2986bebe74dd45a3dcd8c4eef5375085bb Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 11 Dec 2018 17:08:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 ecb479a..a9ee675 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 @@ -53,6 +53,20 @@ public class WmsActionResponseBean { @JsonSerialize(using = ToStringSerializer.class) public Long alId; + /** + * 默认为False，如果这个值为True， + * 就把detailsData的内容以List的格式显示到 列表提示区域 + */ + @ApiParam(value = "是否需要选择单号") + public Boolean toSelected; + + /** + * 与 toSelected 属性配合使用， + * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件 + */ + @ApiParam(value = "关键字段列名") + public String keyColumn; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message;