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 5862925..c505370 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 @@ -24,15 +24,15 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName,String[] params){ + public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params),colnumName,sb); + HqlPack.getInPackString(String.join(",", params), colnumName, sb); return sb.toString(); } /** * 封装公用查询参数 - * @param bean 实体对象 + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -88,6 +88,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 查询任务合并的移库单明细 查询条件封装 * @@ -98,17 +99,15 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { - if (i == orderNos.size()) { - orderNoStr.append("'" + orderNos.get(i) + "'"); - } else { - orderNoStr.append("'" + orderNos.get(i) + "',"); - } + orderNoStr.append("'" + orderNos.get(i) + "',"); } + orderNoStr.deleteCharAt(orderNoStr.length() - 1); result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + - "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo"); + " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + + " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo"); return result.toString(); } + /** * 库存移动单查询封装 * @@ -217,10 +216,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); - if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { + if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { + if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } @@ -411,6 +410,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 查询满足处理周期的作业类型 查询条件封装 * @@ -441,6 +441,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 存储区信息 查询条件封装 * @@ -457,7 +458,7 @@ public class WmsHqlPack { //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); @@ -523,7 +524,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - getStringBuilderPack(wmsASNMaster,result); + getStringBuilderPack(wmsASNMaster, result); return result.toString(); } @@ -602,7 +603,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -686,7 +687,7 @@ public class WmsHqlPack { * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -702,12 +703,12 @@ public class WmsHqlPack { * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); @@ -719,7 +720,7 @@ public class WmsHqlPack { * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -873,17 +874,18 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); @@ -895,11 +897,11 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); @@ -911,7 +913,7 @@ public class WmsHqlPack { * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -921,15 +923,15 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); @@ -941,7 +943,7 @@ public class WmsHqlPack { * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1163,7 +1165,7 @@ public class WmsHqlPack { * 作业流程分页查询 * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { StringBuffer result = new StringBuffer(); //查询参数封装 agDescC;agNameC @@ -1178,7 +1180,7 @@ public class WmsHqlPack { * 作业流程明细分页查询 * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { StringBuffer result = new StringBuffer(); //查询参数封装 @@ -1232,19 +1234,19 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); + HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsActionLog, result); @@ -1256,12 +1258,12 @@ public class WmsHqlPack { * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { StringBuffer result = new StringBuffer(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); @@ -1293,14 +1295,15 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 + * 按moveNo 取最后一笔插入的数据 + * * @param wmsMoveSn * @return */ public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsMoveSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); @@ -1308,53 +1311,57 @@ public class WmsHqlPack { } /** - * 根据条件查询库存条码信息 + * 根据条件查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); } /** - * 根据条件模糊查询库存条码信息 + * 根据条件模糊查询库存条码信息 + * * @param wmsStockSn * @return */ public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); getStringBuilderPack(wmsStockSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } /** - * 根据条件查询库存信息 + * 根据条件查询库存信息 + * * @param wmsStockQuan * @return */ public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsStockQuan, result); return result.toString(); } /** - * 根据用户角色id列表查询数据权限信息 + * 根据用户角色id列表查询数据权限信息 + * * @return */ public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); String data = String.join(",", roleIds); HqlPack.getInPackString(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); @@ -1366,11 +1373,11 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static String packHqlWmsTaskDetail(Map> groupDataAuth) { + public static String packHqlWmsTaskDetail(Map> groupDataAuth) { StringBuffer result = new StringBuffer(); Set>> entries = groupDataAuth.entrySet(); //拼sql - entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ + 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); @@ -1405,11 +1412,10 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { + public static String packHqlAndIn(BaseBean bean, String columnName, List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data,columnName,result); - HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); + HqlPack.getInPackString(data, columnName, result); getStringBuilderPack(bean, result); return result.toString(); } @@ -1421,14 +1427,14 @@ public class WmsHqlPack { */ public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) { StringBuffer result = new StringBuffer(); - if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){ - HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) { + HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){ - HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) { + HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } - if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){ - HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result); + if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { + HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); } getStringBuilderPack(wmsDataAuth, result); return result.toString(); @@ -1448,6 +1454,7 @@ public class WmsHqlPack { /** * 根据条件查询任务生成日志 + * * @param wmsTaskCreateLog * @return */ @@ -1461,23 +1468,25 @@ public class WmsHqlPack { /** * 根据条件查询作业处理组件 + * * @param wmsTransModule * @return */ public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { StringBuffer result = new StringBuffer(); - if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); } - if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); } - if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){ + if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); } getStringBuilderPack(wmsTransModule, result); return result.toString(); } + /** * 根据条件查询系统配置信息 * @param wmsConfig