From 4a717ec544ff97a587d3f5521d7570ef960c3562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 17 Jul 2019 20:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90JOB+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F=EF=BC=88?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97=EF=BC=89=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 86 ++++++++++++++++- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 20 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 15 ++- .../pojo/wms/repository/WmsShippingRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 103 ++++++++++++--------- 6 files changed, 194 insertions(+), 50 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.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 919f1a5..4a79b7c 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 @@ -2700,7 +2700,8 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP", "AMP系统"); + AMP("AMP", "AMP系统"), + ZSLD("ZSLD", "直送拉动"); private String value; private String description; @@ -2988,12 +2989,13 @@ public class WmsEnumUtil { public static SRC_DEST_LOCATE codeOf(int value) { for (int i = 0; i < values().length; i++) { - if (values()[i].value==(value)) { + if (values()[i].value == (value)) { return values()[i]; } } return null; } + public String getDescription() { return description; } @@ -3022,4 +3024,84 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 物料结算标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_FLAG { + INTERNAL_SETTLEMENT("1", "内部结算"), + NOMAL_SETTLEMENT("2", "正常结算"); + + private String value; + private String description; + + OUT_CLOSE_FLAG(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 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; + } + } + + /** + * 物料结算方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_TYPE { + OFF_LINE_SETTLEMENT("10", "下线结算"), + PICK_SETTLEMENT("20", "配料结算"); + + private String value; + private String description; + + OUT_CLOSE_TYPE(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 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java new file mode 100644 index 0000000..91cb071 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 定时任务参数解析Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 16:25 + * @Modify + */ +@Data +public class WmsJobParamModel implements Serializable { + private String organizeCode; + private List zonesNoList; + private Integer snType; +} 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 f2b2102..ee682ea 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 @@ -134,6 +134,10 @@ public class WmsPart extends BaseBean { @ApiParam("項目结算标识") private String outCloseFlag = "2"; + @Column(name = "OUT_CLOSE_TYPE") + @ApiParam("结算方式") + private String outCloseType; + @Transient @ApiParam("总数量") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index bbce7c7..7c3fde7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "存储区集合") private List zoneList; + @Transient + @ApiParam(value = "移动单条码集合") + private List wmsMoveSnList; + public String getAreaNo() { return areaNo; @@ -204,7 +208,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -218,10 +222,11 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; - this.prodCfgTypeCode= prodCfgTypeCode; + this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; @@ -234,7 +239,7 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; } - public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + public WmsStockQuan(String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.locateNo = locateNo; this.boxQty = boxQty; @@ -254,8 +259,8 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; } - public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + public WmsStockQuan(String whNo, String zoneNo, String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.locateNo = locateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java new file mode 100644 index 0000000..ba8806c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description 对象持久层仓用方法控制(产品发运表) + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 15:54 + * @Modify + */ +@Repository +public interface WmsShippingRepository extends BaseRepository { +} 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 9291e8c..60044b8 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 @@ -85,7 +85,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), - wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsDocMovementDetails, result); return result; @@ -177,6 +177,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingDetail * @return */ @@ -208,6 +209,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingAssign * @return */ @@ -413,11 +415,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - if(wmsLocate.getZoneNo() != null){ - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + if (wmsLocate.getZoneNo() != null) { + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); } - // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); @@ -555,6 +557,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); //特殊发货标志 DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); + //单据来源 + DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); @@ -811,8 +815,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ - WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), - WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); @@ -831,7 +835,7 @@ public class WmsHqlPack { public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result); + DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(), "zoneNo", result); //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); @@ -879,6 +883,7 @@ public class WmsHqlPack { return result; } + /** * 业务：库存表报查询封装 * @@ -891,14 +896,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 "); @@ -914,22 +919,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; } + /** * 业务：物料包装查询封装 * @@ -984,9 +990,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), - wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), - wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); + wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true); getStringBuilderPack(wmsMoveMaster, result); return result; @@ -1132,6 +1138,7 @@ public class WmsHqlPack { /** * 条码状态查询报表查询条件 + * * @param wmsStockSn * @return */ @@ -1152,7 +1159,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); - if(wmsStockSn.getIsValid()!= null){ + if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); } getStringBuilderPack(wmsStockSn, result); @@ -1165,7 +1172,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and qty > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and qty > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1445,6 +1452,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); + DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); + if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) { + result.setOrderByStr(wmsStockSn.getOrderByParam()); + } getStringBuilderPack(wmsStockSn, result); return result; } @@ -1561,13 +1575,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; @@ -1575,13 +1590,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); @@ -1600,7 +1616,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 @@ -1613,7 +1629,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; } @@ -1868,7 +1884,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); @@ -1882,7 +1898,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; @@ -1956,6 +1972,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } + /** * 主数据信息 分页查询 * @@ -1965,12 +1982,12 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - if(wmsProdCfgType != null){ + 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); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; } @@ -2000,11 +2017,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, String[] parts) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackArray(parts,"partNo",packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + DdlPreparedPack.getInPackArray(parts, "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); getStringBuilderPack(wmsPart, packBean); return packBean; @@ -2073,11 +2090,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(); //查询参数封装 @@ -2098,7 +2115,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackList(ids,"id",result); + DdlPreparedPack.getInPackList(ids, "id", result); return result; } @@ -2110,14 +2127,14 @@ public class WmsHqlPack { * @param organizeCode * @return */ - public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList,String organizeCode) { + public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList, String organizeCode) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackList(statusList,"asnStatus",result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result); - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getInPackList(statusList, "asnStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(), "asnType", result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);