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 1359294..0e72b17 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 @@ -23,8 +23,8 @@ public class WmsTaskInfoModel implements Serializable { /** * 状态:1=创建,10=待处理,20=已处理 */ - @ApiParam(value = "任务状态", example = "1") - public Integer taskStatus; + @ApiParam(value = "任务状态") + public String taskStatus; @ApiParam("作业类型名称") public String opTypeName; 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 5cd3bf9..472580e 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 @@ -1019,6 +1019,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); @@ -1429,7 +1430,7 @@ public class WmsHqlPack { public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - getStringBuilderPack(wmsStockSn, result); + HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -1514,12 +1515,12 @@ public class WmsHqlPack { * 给定字段动态in sql * * @param columnName - * @param orderNo + * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List orderList) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPack(orderNo, columnName, packBean); + DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);