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 d6d917c..de1b164 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 @@ -4656,7 +4656,7 @@ public class WmsEnumUtil { } /** - * 计划拉动明细表状态创建 + * 计划拉动主表状态创建 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index b2e4e34..0a41d3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String wrokorderNo; + private String woekorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{ private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") - @ApiParam(value = "单据状态", example = "0") + @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; public Integer getOrderStatus() { 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 17c8805..1f4fc92 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 @@ -2618,7 +2618,18 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPack(statusList, "orderStatus", result); + List stringList = null; + List integerList = null; + //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + if(StringUtils.isNotBlank(statusList)){ + stringList = Arrays.asList(statusList.split(",")); + integerList = new ArrayList<>(); + for(String sl : stringList){ + integerList.add(Integer.valueOf(sl)); + } + } + + DdlPreparedPack.getInPackList(integerList, "orderStatus", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); @@ -2637,7 +2648,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result);