From 704d4f209878e2c14d2132b64191c5d9accd8818 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 24 Sep 2019 18:51:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9b9d0e1..f9279e6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -74,6 +74,7 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } + if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } From 750a216fd27f5e443ba7406c5b3a64c6aafca980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 24 Sep 2019 21:26:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=BA=90=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E7=9B=98=E7=82=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 dad2ec7..57f0870 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -27,7 +26,6 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("作业类型名称") public String opTypeName; - @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; @@ -37,30 +35,33 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据业务类型") private String busiTypeDesc; - @Column(name = "ZDATE") @ApiParam(value = "计划日期") private String zdate; - @Column(name = "ZTIME") @ApiParam(value = "计划时间") private String ztime; - @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; - @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; @ApiParam(value = "样式") private WmsMessageStyleModel wmsMessageStyleModel; + @ApiParam(value = "源存储区代码") + private String srcZoneNo; + + @ApiParam(value = "创建日期") + public String createDatetime; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) { + String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String createDatetime, String srcZoneNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; @@ -71,5 +72,7 @@ public class WmsTaskInfoModel implements Serializable { this.ztime = ztime; this.custNo = custNo; this.vendorNo = vendorNo; + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; } }