From 945ef828671ab535b3a9e5c5c9a3d6d60803f71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 25 Jun 2019 16:22:48 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 dd5eee0..23eb182 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 @@ -219,6 +219,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地集合") public List erpZoneNoList; + @Transient + @ApiParam(value = "ERP库存地") + public String erpZoneNo; + public WmsStockSn(){} From e3d5e5bb19745e50c210f27d8d48b9f5ead483c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 18:51:45 +0800 Subject: [PATCH 02/14] =?UTF-8?q?PDA=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8+=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 +++ .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 47 +++++++++++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 2 +- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 67 ++++++++++++---------- 6 files changed, 91 insertions(+), 39 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 853cc70..d4bb7e2 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 @@ -1761,6 +1761,15 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static DATA_OBJ_TYPE codeOf(Integer val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 0e72b17..b20df0e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -16,19 +17,55 @@ import java.io.Serializable; public class WmsTaskInfoModel implements Serializable { @ApiParam("任务单号") public String orderNo; - - @ApiParam("关联单号") - public String refSrc; - + @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @ApiParam(value = "任务状态") - public String taskStatus; + public Integer taskStatus; @ApiParam("作业类型名称") public String opTypeName; + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @ApiParam("关联单号") + public String refSrc; + @ApiParam(value = "关联单据类型") private String refType; + + @Column(name = "ZDATE") + @ApiParam(value = "计划日期") + private String zdate; + + @Column(name = "ZTIME") + @ApiParam(value = "计划时间") + private String ztime; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfoModel() { + } + + public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, + String refType, String zdate, String ztime, String custNo, String vendorNo) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.opTypeName = opTypeName; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + this.refType = refType; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 1198e5b..8670c4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -34,7 +34,7 @@ public class WmsDataAuth extends BaseBean { @Column(name = "DATA_OBJ") @ApiParam(value = "数据对象") - private String dataObj; + private Integer dataObj; @Column(name = "DATA_OBJ_VALUE") @ApiParam(value = "数据对象值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9181e8a..558edbe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name="PART_NO") @ApiParam("物料编码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 8442671..20c7692 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** @@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean { private String roleCode; @ApiParam("数据对象") - private String dataObj; + private Integer dataObj; @ApiParam("数据对象值") private String dataObjValue; 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 ead2da2..80c4490 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 @@ -170,6 +170,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingDetail * @return */ @@ -201,6 +202,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingAssign * @return */ @@ -651,6 +653,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + DdlPreparedPack.getStringEqualPack(wmsTaskInfo.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsTaskInfo, result); @@ -859,6 +862,7 @@ public class WmsHqlPack { return result; } + /** * 业务：库存表报查询封装 * @@ -871,14 +875,14 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere); - if(wmsStockQuan.getZoneNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere); + if (wmsStockQuan.getZoneNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))), ","), "", findWhere); //DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere); + if (wmsStockQuan.getPartNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))), ","), "partNo", findWhere); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 findWhere.append(" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); @@ -894,22 +898,23 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - if(wmsStockQuan.getZoneNo() != null){ + if (wmsStockQuan.getZoneNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ + if (wmsStockQuan.getPartNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); } getStringBuilderPack(wmsStockQuan, result); return result; } + /** * 业务：物料包装查询封装 * @@ -1431,9 +1436,8 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); - DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); -// String data = String.join(",", roleIds); + DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result); + DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(dataAuth, result); return result; @@ -1493,13 +1497,14 @@ public class WmsHqlPack { /** * 把 List 中的一组数据重新封装到List中 + * * @param mapList * @param keyName */ - private static List cyclicTraversal(List mapList,String keyName) { + private static List cyclicTraversal(List mapList, String keyName) { List list = new ArrayList(); - for(int i=0;i map = mapList.get(i); + for (int i = 0; i < mapList.size(); i++) { + Map map = mapList.get(i); list.add(map.get(keyName)); } return list; @@ -1507,13 +1512,14 @@ public class WmsHqlPack { /** * 把 List 中的一组查询条件封装成 HQL + * * @param mapList * @param keyName * @param columnName * @param packBean */ - private static void packMutilConditionHql(List mapList, String keyName,String columnName, DdlPackBean packBean) { - int index = 1; + private static void packMutilConditionHql(List mapList, String keyName, String columnName, DdlPackBean packBean) { + int index = 1; String columnParam = null; for (Map item : mapList) { columnParam = columnName + String.valueOf(index); @@ -1532,7 +1538,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList,Map> groupDataAuth) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql @@ -1545,7 +1551,7 @@ public class WmsHqlPack { if (StringUtils.isNotBlank(data)) { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) { - DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean); + DdlPreparedPack.getInPackList(cyclicTraversal(mapList, "TRANS_TYPE_CODE"), "transTypeCode", packBean); //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); break; } @@ -1580,8 +1586,8 @@ public class WmsHqlPack { if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { - DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); + if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) { + DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); @@ -1800,7 +1806,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''"); + result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); getStringBuilderPack(wmsStockSn, result); @@ -1814,7 +1820,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1888,6 +1894,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } + /** * 主数据信息 分页查询 * @@ -1899,8 +1906,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; } @@ -1930,11 +1937,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List partNoList) { + 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); + DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); getStringBuilderPack(wmsPart, packBean); return packBean; @@ -2002,11 +2009,11 @@ public class WmsHqlPack { * 根据存储区编号集合、库位类型查询库位信息 * * @param zoneNoList - *@param wmsZones + * @param wmsZones * @param locateType * @return */ - public static DdlPackBean packLocateNoByZoneNo(List zoneNoList , WmsZones wmsZones , Integer locateType) { + public static DdlPackBean packLocateNoByZoneNo(List zoneNoList, WmsZones wmsZones, Integer locateType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 From 48589a10cb5932c78022171100c193fd8b8c5f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 25 Jun 2019 19:27:11 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 7d7156b..66fd04c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -34,7 +34,7 @@ public class SapBase { private String rechms; @ApiParam(value = "同步标志", example = "-1") - private String synflg = "Y"; + private String synflg = "N"; @ApiParam(value = "同步日期", example = "-1") private String synymd; @@ -43,7 +43,7 @@ public class SapBase { private String synhms; @ApiParam(value = "处理标志", example = "-1") - private String actflg = "Y"; + private String actflg = "N"; @ApiParam(value = "处理日期", example = "-1") private String actymd; @@ -52,7 +52,7 @@ public class SapBase { private String acthms ="00:00:00"; @ApiParam(value = "状态标志", example = "-1") - private String staflg = "Y"; + private String staflg = "N"; @ApiParam(value = "顺序号", example = "-1") private Integer seq = 1; @@ -62,11 +62,13 @@ public class SapBase { public String getSynymdTime() { SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); - return format.format(new Date()); + //format.format(new Date()) + return ""; } public String getSynhmsTime() { SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); - return format.format(new Date()); + //format.format(new Date()) + return ""; } } From 8ba21737530ddf10fca8907e6b46eda0a640b711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 19:34:25 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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 | 6 +++--- 1 file changed, 3 insertions(+), 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 d924728..0d6a6a4 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 @@ -1963,11 +1963,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, List partNoList) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getInPackArray(parts,"partNo",packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); getStringBuilderPack(wmsPart, packBean); return packBean; From 0f3d67d1103ff58262939bab3b49623717c9f6f3 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Tue, 25 Jun 2019 19:41:44 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9C=8B=E6=9D=BF=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 +++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 16 +++++ .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 84 ++++++++++++++++++++++ .../wms/repository/WmsWorkCenterRepository.java | 2 + .../repository/WmsWorkCenterZoneRepository.java | 2 + 5 files changed, 161 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java 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 853cc70..a53176c 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 @@ -2547,4 +2547,61 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * PO ASN 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_RECEIVE_STATUS { + WAITING_RECEIVE_TIME_EARLY("R0001", "待收货"), + RECEIVEING_TIME_EARLY("R0002", "提前收货中"), + RECEIVED_IIME_EARLY("R0003", "提前收货完成"), + WAITING_RECEIVE_TIME_IN("R0004", "待收货"), + RECEIVEING_TIME_IN("R0005", "正常收货中"), + RECEIVED_TIME_IN("R0006", "正常收货完成"), + WAITING_RECEIVE_TIME_LATE("R0007", "延迟未收货"), + RECEIVEING_TIME_LATE("R0008", "延迟收货中"), + RECEIVED_TIME_LATE("R0009", "延迟收货完成"), + STATUS_NEED_TO_CHECK("R0010", "待查询"); + + private String value; + private String description; + + PO_RECEIVE_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + public static PO_RECEIVE_STATUS codeOf(String value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + return values()[i]; + } + } + return null; + } + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 e90728d..e51bbaa 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 @@ -119,4 +119,20 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "工厂名称") public String organizeName; + + @Transient + @ApiParam(value = "最早收货时间") + public String earliestReceTime; + + @Transient + @ApiParam(value = "最晚收货时间") + public String latestReceTime; + + public WmsPoSn(){} + + public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ + this.orderNo = orderNo; + this.earliestReceTime = earliestReceTime; + this.latestReceTime = latestReceTime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java new file mode 100644 index 0000000..e380985 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.time.LocalTime; + +/** + * @Description : 供应商收货看板信息 + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-24 15:04 + * @Modify: + **/ +@Data +@Api("供应商收货看板") +public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ + + @ApiParam("订单号") + private String orderNo; + @ApiParam("供应商名称") + private String vendorName; + @ApiParam("收货通道") + private String dock; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("项目名称") + private String prodCfgTypeName; + @ApiParam("计划收货日期") + private String planDate; + @ApiParam("计划收货时间") + private String planTime; + @ApiParam("总数量") + private Double qty; + @ApiParam("已收货数量") + private Double recQty; + @ApiParam("最早收货时间") + private String earliestReceTime; + @ApiParam("最晚收货时间") + private String latestReceTime; + @ApiParam("供应商号码") + private String vendorNo; + @ApiParam("物料") + private String partNo; + @ApiParam("收货状态") + private String receiveStatus; + + public WmsPoAsnRecvModel(String orderNo,String dock,String vendorNo,String prodCfgTypeCode, String prodCfgTypeName,String planDate,String planTime,Double qty,Double recQty){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + this.qty = qty; + this.recQty = recQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.vendorNo = vendorNo; + + } + public WmsPoAsnRecvModel(String orderNo,String dock,String planDate,String planTime){ + this.orderNo = orderNo; + this.dock = dock; + this.planDate = planDate; + this.planTime = planTime; + } + public WmsPoAsnRecvModel(){} + + @Override + public int compareTo(WmsPoAsnRecvModel o) { + return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0; + } + + public static LocalTime getLocalTime(String planTime){ + LocalTime time = null; + try { + time = LocalTime.parse(planTime); + }catch (Exception e){ + e.printStackTrace(); + } + return time; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java index b662fb2..a6a06a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; +import org.springframework.stereotype.Repository; /** * @Description : 产线信息管理(工作中心) @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; * @CreateDate : 2019-06-19 16:20 * @Modify: **/ +@Repository public interface WmsWorkCenterRepository extends BaseRepository { } 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 index 071dfd4..1d79a06 100644 --- 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; +import org.springframework.stereotype.Repository; /** * @Description : 产线(工作中心)-存储区信息管理 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone; * @CreateDate : 2019-06-20 14:55 * @Modify: **/ +@Repository public interface WmsWorkCenterZoneRepository extends BaseRepository { } From b13a9cd79c9fac9bc62e5c004921628cc63b90c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 25 Jun 2019 20:54:33 +0800 Subject: [PATCH 06/14] =?UTF-8?q?PDA=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8+=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=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 | 1 - 1 file changed, 1 deletion(-) 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 0d6a6a4..fc513e2 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 @@ -1466,7 +1466,6 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result); - DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(roleIds, "roleCode", result); getStringBuilderPack(dataAuth, result); return result; From b1ca55e3a30b4c3fd7181592ce6f333518833790 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Tue, 25 Jun 2019 21:00:40 +0800 Subject: [PATCH 07/14] pojo --- .../i3plus/pojo/wms/repository/WmsBomTotalRepository.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java new file mode 100644 index 0000000..f49f127 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomTotalRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsBomTotal; +import org.springframework.stereotype.Repository; + +/** + * Created by Administrator on 2019/6/25. + */ +@Repository +public interface WmsBomTotalRepository extends BaseRepository { +} From 5d1447c92a1a80108df6abbd59ce4e840a084d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Tue, 25 Jun 2019 23:52:27 +0800 Subject: [PATCH 08/14] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=A4=9A=E7=BA=A7=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 46454dd..1280e58 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -884,4 +884,9 @@ public class CommonEnumUtil { return tmp; } } + + // 数据有效的静态常量 + public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); + // 数据未删除的静态常量 + public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java index 776cec3..eb99d06 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.repository; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; /** @@ -14,4 +16,11 @@ import org.springframework.stereotype.Repository; @Repository public interface WmsZonesRepository extends BaseRepository { + /** + * 根据工厂代码和存储编号查询存储区信息 + * @param organizeCode 工厂代码 + * @param zoneNo 存储区编号 + * @return 存储区信息 + */ + WmsZones getFirstByOrganizeCodeAndZoneNo(String organizeCode, String zoneNo); } From 91f1a120a2f839ca5930f6636026438b5266bb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 26 Jun 2019 00:36:01 +0800 Subject: [PATCH 09/14] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=B8=8D=E8=BF=87=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index 8670c4a..f6e5a8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -36,6 +36,10 @@ public class WmsDataAuth extends BaseBean { @ApiParam(value = "数据对象") private Integer dataObj; + public String getDataObjString() { + return String.valueOf(dataObj); + } + @Column(name = "DATA_OBJ_VALUE") @ApiParam(value = "数据对象值") private String dataObjValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 558edbe..9181e8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name="PART_NO") @ApiParam("物料编码") 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 dd5eee0..a4ba663 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 @@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "客户条码") private String custSn; + @Column(name = "ERP_ZONE_NO") + @ApiParam(value = "ERP库存地") + public String erpZoneNo; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 7c28110bd410a1fb1da8a10e5f16e7ba69c310f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 26 Jun 2019 10:31:11 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BF=98=E4=BA=86?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.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/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9181e8a..558edbe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public String item; + public Integer item; @Column(name="PART_NO") @ApiParam("物料编码") From af7e8d7a4384e95c8d37ddbad8fe15315c3cf305 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Wed, 26 Jun 2019 12:01:16 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=A0=81?= 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 fc513e2..2223392 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 @@ -1929,8 +1929,10 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); - DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + if(wmsProdCfgType != null){ + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + } DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // getStringBuilderPack(wmsProdCfgType, result); From 484c5942e82248f07f1af59ba9c4af31012e3d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 26 Jun 2019 14:10:33 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AEItem=E5=B1=9E=E6=80=A7=E9=83=BD=E7=94=A8Strin?= =?UTF-8?q?g=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index c734ff1..3679498 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import java.util.List; /** * @Description : ASN订单明细信息 @@ -45,7 +44,7 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index 57d4028..7fb224c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name="IS_ADJUST") @ApiParam(value = "调整标识", example = "1") @@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean { public String unit; public WmsCSAdjustRange(){} - public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) { + public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) { this.orderNo = orderNo; this.item = item; this.isAdjust = isAdjust; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index e7018f3..23dca00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 0f24114..970a44f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "PART_NO") @ApiParam("物料编码") 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 67377b4..d9563fd 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 @@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 558edbe..9181e8a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -39,7 +39,7 @@ public class WmsDocMovementSn extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name="PART_NO") @ApiParam("物料编码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index d7e8232..5204005 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + public String item; @Column(name = "QTY") @ColumnDefault("0") 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 e7610a3..b8f29c2 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 @@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean { @Column(name="ITEM") @ApiParam("行号") - public Integer item; + public String item; /** * 状态:1=创建,10=已处理 From 05c56e46b4dfa857a89ead927f1a8a59d56aa82b Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Wed, 26 Jun 2019 16:00:32 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 19 ++++++++++++++++ .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 2 +- 3 files changed, 46 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 caf74ae..af67eec 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 @@ -2638,4 +2638,30 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 包装类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_LEVEL_STATUS { + LOW("LOW", "低于最低库存"), + HIGH("HIGH", "高于最高库存"), + NORMAL("NORMAL", "安全库存"); + + private String code; + private String description; + + STOCK_LEVEL_STATUS(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 5335318..110155d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :物料实体 @@ -126,4 +127,22 @@ public class WmsPart extends BaseBean { @Column(name="OUT_CLOSE_FLAG") @ApiParam("項目结算标识") private String outCloseFlag; + + @Transient + @ApiParam("总数量") + private Double qty; + + @Transient + @ApiParam("库存水平") + private String stockLevelStatus; + + public WmsPart(){} + + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){ + this.partNo = partNo; + this.partName = partName; + this.max = maxQty; + this.min = minQty; + this.qty = cqty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index e380985..0c43dd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -69,7 +69,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable Date: Wed, 26 Jun 2019 16:15:57 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 3c8359b..da720a0 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 @@ -2657,16 +2657,16 @@ public class WmsEnumUtil { HIGH("HIGH", "高于最高库存"), NORMAL("NORMAL", "安全库存"); - private String code; + private String value; private String description; - STOCK_LEVEL_STATUS(String code, String description) { - this.code = code; + STOCK_LEVEL_STATUS(String value, String description) { + this.value = value; this.description = description; } - public String getCode() { - return code; + public String getValue() { + return value; } public String getDescription() {