From 35839db806dcc7e5561677e88a532ff9cacd1290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 Jan 2020 13:26:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG#7359=20=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E5=92=8C=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 11 +++++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++------- 3 files changed, 20 insertions(+), 11 deletions(-) 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 e618c9d..db1551c 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 @@ -736,6 +736,16 @@ public class WmsEnumUtil { return tmp; } + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { 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 fac11e3..e55cf6c 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 @@ -32,8 +32,8 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("关联单号") public String refSrc; - @ApiParam(value = "关联单据业务类型") - private String busiTypeDesc; + @ApiParam(value = "关联单据业务类型代码") + private String busiTypeCode; @ApiParam(value = "计划日期") private String zdate; @@ -59,18 +59,21 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "创建人") public String createUser; + @ApiParam(value = "关联单据类型") + public String refType; + 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 busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; this.transTypeCode = transTypeCode; this.refSrc = refSrc; - this.busiTypeDesc = busiTypeDesc; + this.busiTypeCode = busiTypeCode; this.zdate = zdate; this.ztime = ztime; this.custNo = custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ea889c4..ef16765 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -132,13 +132,9 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - public Integer busiType; - - @Column(name = "BUSI_TYPE_DESC") - @ApiParam("业务类型描述") - public String busiTypeDesc; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam("业务类型代码") + public String busiTypeCode; @Column(name = "TRANS_TYPE_CODE_RDD") @ApiParam("交易类型") From fd1a0ebdb816fe05b43b4f27e02e29f3255a8d5b Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 14 Jan 2020 14:18:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1404=20?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B9=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 61 ++-------------------- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 13 +++++ 2 files changed, 16 insertions(+), 58 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java index b038988..f2ec4a3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -18,63 +18,8 @@ public class QcCheckStandardModel { private Long id; - @ApiParam("物料编码") - private String partNo; + @ApiParam("列头") + private String title; - @ApiParam("工作中心代码") - private String workCenterCode; - - @ApiParam("工作单元代码") - private String workCellCode; - - @ApiParam("检测类型") - private Integer checkType; - - @ApiParam("检测项") - private String checkItem; - - @ApiParam("检测标准") - private String checkStandard; - - @ApiParam("检测指导") - private String checkGuide; - - @ApiParam("频率") - private String checkFrequency; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("检测结果") - private String checkResult; - - @ApiParam("检测值") - private String checkValue; - - @ApiParam("检测项类型") - private String checkItemType; - - @ApiParam("检测项类型名称") - private String checkItemTypeName; - - private List childQcList; - - public QcCheckStandardModel() { - } - - public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard - , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { - this.id = id; - this.partNo = partNo; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - this.checkType = checkType; - this.checkItem = checkItem; - this.checkStandard = checkStandard; - this.checkGuide = checkGuide; - this.checkFrequency = checkFrequency; - this.partName = partName; - this.checkItemType = checkItemType; - this.checkItemTypeName = checkItemTypeName; - } + private List resultList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 32ad09c..b11e807 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -98,6 +98,19 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "动作类型") private String actionType; + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + + @ApiParam(value = "动作类型名称") + private String actionTypeName; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("原材料零件名称") + private String itemPartName; + + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; }