From 86e96e8f7617eb9e2538abedb21f5047d9b2e895 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 12 Mar 2019 09:21:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=8F=90=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 2 +- .../estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java | 1 - .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 ++++----- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 5d5d293..ff1b98b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -58,11 +58,11 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name = "ZDATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; @Column(name = "ZTIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; /** * 状态:N=正常,C=行取消,R=已收货 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index ab1f30c..9ab2ff2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -62,4 +62,7 @@ public class WmsCSOrderMaster extends BaseBean { @ApiParam(value = "盘点明细集") public List wmsCSOrderDetailsList; + @Column(name = "IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; } 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 8d645ee..b1b7c0c 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 @@ -57,7 +57,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "TRANS_TYPE_CODE") @ApiParam("交易类型") - private String transTypeCode; + public String transTypeCode; @Column(name = "PRE_USE_TIME") @ApiParam(value = "预计作业时间(分钟)", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index a6766aa..5f5c023 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_TASK_SRC") -@Api("作业任务表") +@Api("作业任务数据来源表") public class WmsTaskSrc extends BaseBean { @Column(name = "OP_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java index c248080..5d44e77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java @@ -12,6 +12,5 @@ import org.springframework.stereotype.Repository; * @CreateDate : 2019-03-06 14:41 * @Modify: **/ -@Repository public interface WmsTaskSrcRepository extends BaseRepository { } 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 048fea8..5d7f5cc 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 @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.wms.bean.*; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -58,8 +57,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -585,8 +584,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result);