From 03fe15e2f4d7fbf9804697e77a24cbd318bd87b1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 11 Mar 2019 13:12:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 8 ++++---- .../cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index cc02e4e..e8a2dbd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -533,10 +533,10 @@ public class BlockReportEnumUtil { LIKE_LEFT(6, "LIKE", "左模糊"), LIKE_RIGHT(7, "LIKE", "右模糊"), EQUAL(8, "=", "等于"), - EQUAL_NOT(9, "!=", "不等于"), - AND(10, "AND", "AND"), - OR(11, "OR", "OR"), - NOT(12, "NOT", "NOT"), + EQUAL_NOT(9, "<>", "不等于"), +// AND(10, "AND", "AND"), +// OR(11, "OR", "OR"), +// NOT(12, "NOT", "NOT"), IS_NULL(13, "IS NULL", "IS NULL"), IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL"); diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index bfa9604..db477bd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -77,11 +77,12 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - if(template.getTemplateStatus() != null && - template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){ - HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); - }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + if(template.getTemplateStatus() != null){ + if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ + HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + }else { + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + } } HqlPack.getStringLikerPack(template.getName(),"name",result); From 2943bfcf9fd7c7c9e0a878a5b32f1a2148116566 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 11 Mar 2019 19:57:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 9e2eff3..58f2528 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskCycleId; + @Column(name="TASK_PLAN_ID") + @ApiParam(value ="任务计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskPlanId; + @Column(name="TASK_PLAN_NAME") @ApiParam(value ="任务计划名称") private String taskPlanName; From d289e7009a72566edd457df95319b2342af6c87d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 11 Mar 2019 21:13:14 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E8=A1=A8=20=20=E5=B7=B2?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a8fd0f0..2568b63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "已收货数量", example = "1") private Double recQty; + @Column(name = "MOVE_QTY") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; From 9a6a9018cf818dcf49fa7f94310f64bf08ec4dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 11 Mar 2019 21:18:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=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 | 90 +++++++++++----------- 1 file changed, 45 insertions(+), 45 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 3504d07..2c215e7 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 @@ -347,51 +347,51 @@ public class WmsEnumUtil { } } - /** - * PO条码状态信息 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_DETAILS_STATUS { - CREATE(10, "新建"), - WAREHOUSING(30, "已打印"), - RECEIPT_FINISH(20, "已收货"); - - private int value; - private String description; - - SN_DETAILS_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 int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } +// /** +// * PO条码状态信息 +// */ +// @JsonFormat(shape = JsonFormat.Shape.OBJECT) +// public enum SN_DETAILS_STATUS { +// CREATE(10, "新建"), +// WAREHOUSING(30, "已打印"), +// RECEIPT_FINISH(20, "已收货"); +// +// private int value; +// private String description; +// +// SN_DETAILS_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 int descOf(String desc) { +// int tmp = 1; +// for (int i = 0; i < values().length; i++) { +// if (values()[i].description.equals(desc)) { +// tmp = values()[i].value; +// } +// } +// return tmp; +// } +// } /** * 消息队列，队列名称 From d2190c55c77d68bbeb6588e326df853b78d03c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 11 Mar 2019 21:44:47 +0800 Subject: [PATCH 5/7] =?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 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 90 +++++++++++----------- 1 file changed, 45 insertions(+), 45 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 63ee5c5..ca1e277 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 @@ -378,51 +378,51 @@ public class WmsEnumUtil { } } -// /** -// * PO条码状态信息 -// */ -// @JsonFormat(shape = JsonFormat.Shape.OBJECT) -// public enum SN_DETAILS_STATUS { -// CREATE(10, "新建"), -// WAREHOUSING(30, "已打印"), -// RECEIPT_FINISH(20, "已收货"); -// -// private int value; -// private String description; -// -// SN_DETAILS_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 int descOf(String desc) { -// int tmp = 1; -// for (int i = 0; i < values().length; i++) { -// if (values()[i].description.equals(desc)) { -// tmp = values()[i].value; -// } -// } -// return tmp; -// } -// } + /** + * PO条码状态信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_DETAILS_STATUS { + CREATE(10, "新建"), + WAREHOUSING(30, "已打印"), + RECEIPT_FINISH(20, "已收货"); + + private int value; + private String description; + + SN_DETAILS_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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 消息队列，队列名称 From 8ac4046a7d1ab2634bef09b9d885109f599ab5bd Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 11 Mar 2019 22:34:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E8=8E=B7=E5=8F=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=85=AC=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/DataAuthEnumUtil.java | 45 ------------------ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++-- .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 26 +++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 ++++++++++++++-------- 4 files changed, 102 insertions(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java deleted file mode 100644 index 6c4d4c3..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.base.enumutil; - -import com.fasterxml.jackson.annotation.JsonFormat; - -/** - * @Description : wms数据权限枚举 - * @Reference : - * @Author : jack.lv - * @CreateDate : 2019-3-8 15:53 - * @Modify: - **/ -public class DataAuthEnumUtil { - - /** - * 数据对象枚举 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_OBJ_TYPE { - WAREHOUSE("10", "WAREHOUSE", "仓库对象"), - ZONE("20", "ZONE", "存储区对象"), - LOCATE("30", "LOCATE", "库位对象"); - - private String code; - private String description; - String value; - - DATA_OBJ_TYPE(String value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - } -} 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 ca1e277..c22bdc9 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 @@ -1819,18 +1819,53 @@ public class WmsEnumUtil { } /** - * 可选项类型枚举 + * 数据对象枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_OBJ_TYPE { + WAREHOUSE(10, "WAREHOUSE", "仓库对象"), + ZONE(20, "ZONE", "存储区对象"), + LOCATE(30, "LOCATE", "库位对象"), + MATERIAL(40, "MATERIAL", "物料对象"); + + private String code; + private String description; + int value; + + DATA_OBJ_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; + } + } + + /** + * 数据操作枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_ROLE_TYPE { - WAREHOUSE(1, "WAREHOUSE", "仓库"), - STOCK(2, "STOCK", "库存"); + public enum DATA_OBJ_OP_TYPE { + ADD(10, "ADD", "新增"), + DEL(20, "DEL", "删除"), + UPD(30, "UPD", "修改"), + QUERY(40, "QUERY", "查询"); private String code; private String description; int value; - DATA_ROLE_TYPE(int value, String code, String description) { + DATA_OBJ_OP_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index c01e38b..802e693 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -451,6 +451,32 @@ public class HqlPack { * @param columnName * @param result */ + public static void getInOrPackString(String data,String columnName, StringBuffer result){ + if (data != null && data.trim().length()>0) { + data = getSafeParam(data); + //判断最后一位是不是逗号 + if(data.lastIndexOf(",") != (data.length()-1)){ + data += ","; + } + String[] dataArray = data.substring(0, data.length()-1).split(","); + data = ""; + for (int i = 0 ; i < dataArray.length ;i++) { + if(i == dataArray.length -1){ + data += "'" + dataArray[i] + "'"; + }else{ + data += "'" + dataArray[i] + "',"; + } + } + result.append(" or model."+columnName+" in ( "+ data+ " )"); + } + } + + /** + * 封装in String查询语句 + * @param data + * @param columnName + * @param result + */ public static void getNotInPackString(String data,String columnName, StringBuffer result){ if (data != null && data.trim().length()>0) { data = getSafeParam(data); 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 048fea8..f039f32 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 @@ -2,19 +2,22 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList; import org.apache.commons.lang3.StringUtils; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import static com.alibaba.fastjson.JSON.parseArray; + /** * @Description : 仓库管理对象封装 * @Reference : @@ -1344,13 +1347,23 @@ public class WmsHqlPack { public static String packHqlWmsDataAuth(List roleIds) { StringBuffer result = new StringBuffer(); String data = String.join(",", roleIds); - // 参数数组 [1,2,3] -> "1,2,3" HqlPack.getInPack(data,"roleCode",result); getStringBuilderPack(new WmsDataAuth(), result); return result.toString(); } /** + * 根据用户角色id列表查询数据权限信息 + * @return + */ + public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** * 根据权限数据拼查询任务详情sql * @param groupDataAuth * @return @@ -1358,25 +1371,30 @@ public class WmsHqlPack { public static String packHqlWmsTaskDetail(Map> groupDataAuth) { StringBuffer result = new StringBuffer(); Set>> entries = groupDataAuth.entrySet(); - String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue(); - String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue(); - String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue(); //拼sql entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ List value = o.getValue(); List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); - if(warehouse.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destWhNo",result); - } - if(locate.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destLocateNo",result); - } - if(zone.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destZoneNo",result); + if (StringUtils.isNotBlank(data)) { + List mapList = JSONObject.parseArray(data, Map.class); + if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) { + for (Map whNoItem : mapList) { + HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) { + for (Map locateNoItem : mapList) { + HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) { + for (Map zoneNoItem : mapList) { + HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) { + for (Map zoneNoItem : mapList) { + HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result); + } + } } }); getStringBuilderPack(new WmsDataAuth(), result); @@ -1392,7 +1410,7 @@ public class WmsHqlPack { public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPack(data,columnName,result); + HqlPack.getInPackString(data,columnName,result); getStringBuilderPack(bean, result); return result.toString(); } From 9c08de7a7a2244525413ad703d350e5860be97de Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 11 Mar 2019 22:40:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= 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 | 3 --- 1 file changed, 3 deletions(-) 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 f039f32..0404699 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 @@ -8,7 +8,6 @@ import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -16,8 +15,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static com.alibaba.fastjson.JSON.parseArray; - /** * @Description : 仓库管理对象封装 * @Reference :