From 87dfdc64711edc0ffd362418e52dc173e04255ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 26 Sep 2019 10:49:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95notInPa?= =?UTF-8?q?ckArray=EF=BC=88=EF=BC=89=EF=BC=8C=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=20notInPack()=20notInPackString()?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index edb8348..3d97300 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -504,6 +504,19 @@ public class DdlPreparedPack { } /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); + } + } + + /** * 封装in String查询语句 * * @param data @@ -559,9 +572,9 @@ public class DdlPreparedPack { data = ""; for (int i = 0; i < dataArray.length; i++) { if (i == dataArray.length - 1) { - data += "'" + dataArray[i] + "'"; + data += "" + dataArray[i] + ""; } else { - data += "'" + dataArray[i] + "',"; + data += "" + dataArray[i] + ","; } } packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); From e42cd80b8bfbb4196807e3834ddde043bf809b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 26 Sep 2019 16:17:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 +-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++ 3 files changed, 57 insertions(+), 2 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 0137da0..44b70e6 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 @@ -377,6 +377,44 @@ public class WmsEnumUtil { } /** + * 条码打印状态 （库存条码打印字段使用） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_STATUS { + PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码"); + + private int value; + private String description; + + PRINT_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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 库位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 43dfd15..37201b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** - * 1:已打印；2：未打印 + * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") 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 38ae263..b6cafeb 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 @@ -208,6 +208,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -593,6 +599,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsASNMaster, result); return result; @@ -1529,6 +1540,12 @@ public class WmsHqlPack { DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); + if(wmsStockSn.getPrinted()!= null){ + if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); + } + } + getStringBuilderPack(wmsStockSn, result); return result; }