From f7d4f85d458240ee8eb15b701272ba61f34afab4 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 20 Jun 2019 13:08:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 2 +- .../estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 43fbac8..b960f52 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") - private String vendorNo; + private String UnitNo; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java new file mode 100644 index 0000000..0e71027 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsUnitConvertReposity extends BaseRepository { +} From 8289de825971b80fb03b24693cbb58cc82e51c94 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 20 Jun 2019 13:52:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=96=B0=20=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 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 30d28bc..5916433 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 @@ -1845,4 +1845,21 @@ public class WmsHqlPack { return result; } + /** + * 物料 条件封装 + * + * @param wmsPart + * @return + */ + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List partNoList) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + getStringBuilderPack(wmsPart, packBean); + + return packBean; + } + + } From 5f898661c76f52544ef2bb353cf9e4f9c231e6e2 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Thu, 20 Jun 2019 15:00:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A7=E7=BA=BF(?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83)-=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=8C=BA=E4=BF=A1=E6=81=AF=20repository?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsWorkCenterZoneRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java new file mode 100644 index 0000000..071dfd4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterZoneRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; + +/** + * @Description : 产线(工作中心)-存储区信息管理 + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-20 14:55 + * @Modify: + **/ +public interface WmsWorkCenterZoneRepository extends BaseRepository { +} From f69795cc5fb6524b8ceb5282a7446d4a459feb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 20 Jun 2019 15:38:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 23 ++++++++++++++++++++++ 1 file changed, 23 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 0cd5c14..df76232 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 @@ -1827,6 +1827,28 @@ public class WmsHqlPack { getStringBuilderPack(wmsLineLocatePart, result); return result; } + + /** + * 任务数据来源唯一校验 + * + * @param wmsTaskSrc + * @return + */ + public static DdlPackBean packHqlWmsTaskSrcIsUniq(WmsTaskSrc wmsTaskSrc) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getDataSrc(), "dataSrc", result); + DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getBusiType(), "busiType", result); + DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getPriority(), "priority", result); + DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsSn(), "isSn", result); + DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsOneStep(), "isOneStep", result); + getStringBuilderPack(wmsTaskSrc, result); + return result; + } + /** * 任务数据来源 分页查询 * @@ -1841,6 +1863,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsTaskSrc, result); return result; } + /** * 供应商零件 分页查询 * From 91999948b6943cddee5c5471d06cf0dc80556ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 20 Jun 2019 17:23:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 53 +++++++++++++--------- 1 file changed, 32 insertions(+), 21 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 0cd5c14..a8e2ecc 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 @@ -1462,26 +1462,29 @@ public class WmsHqlPack { if (StringUtils.isNotBlank(data)) { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) { - packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { - packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { - packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { - packMutilConditionHql(mapList, "PART_NO", "partNo", result); - } + DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"WH_CODE"), "destWhNo", result); + //packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); + }/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { + DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"LOCATE_NO"), "destLocateNo", result); + //packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); + }*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { + DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"ZONE_CODE"), "destZoneNo", result); + //packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); + } /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { + DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result); + //packMutilConditionHql(mapList, "PART_NO", "partNo", result); + }*/ } } //转换封装后的hql - String packedHql = result.getPackedHql(); + /*String packedHql = result.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - result.setWhereAppend(packedHql); - + result.setWhereAppend(packedHql);*/ // 通用数据拼接 WmsDataAuth wmsDataAuth = new WmsDataAuth(); wmsDataAuth.setOrganizeCode(organizeCode); @@ -1490,6 +1493,20 @@ public class WmsHqlPack { } /** + * 把 List 中的一组数据重新封装到List中 + * @param mapList + * @param keyName + */ + private static List cyclicTraversal(List mapList,String keyName) { + List list = new ArrayList(); + for(int i=0;i map = mapList.get(i); + list.add(map.get(keyName)); + } + return list; + } + + /** * 把 List 中的一组查询条件封装成 HQL * @param mapList * @param keyName @@ -1518,37 +1535,31 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList,Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); - Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); - for (Map.Entry> map : entries) { - String key = map.getKey(); List valueList = map.getValue(); List vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); - if (StringUtils.isNotBlank(data)) { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) { - - packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); + DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean); + //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); break; } } } - //转换封装后的hql - String packedHql = packBean.getPackedHql(); + /*String packedHql = packBean.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - packBean.setWhereAppend(packedHql); - + packBean.setWhereAppend(packedHql);*/ DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);