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 a42e0af..4ab91b7 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 @@ -65,11 +65,33 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "erp单号") public String erpSrcNo; + @ApiParam(value = "工厂代码") + public String organizeCode; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, + String createDatetime, String srcZoneNo, String createUser, String organizeCode) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.opTypeName = opTypeName; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + this.busiTypeCode = busiTypeCode; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; + this.createUser = createUser; + this.organizeCode = organizeCode; + } + + public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 81578e5..1a63eb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -247,6 +247,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号组") public String[] partNos; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index a137f31..9132494 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -104,6 +108,10 @@ public class WmsTaskInfo extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; + public WmsTaskInfo(){}; public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ 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 6c69ad7..667156b 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 @@ -224,7 +224,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); - + DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean;