From 0bb69b6505941bbff8fe2f2833d2a3924264f94d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Dec 2020 14:53:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index b92fbbe..e175815 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import lombok.Data; import java.io.Serializable; @@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable { private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; + private List wmsStockSnList; public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) { this.details = details; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 69772a7..e25e48e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -70,9 +70,12 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; + /** + * 实盘数量 + **/ @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "实盘数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double factQty; /** @@ -80,7 +83,7 @@ public class WmsCSFactTrans extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 85b257d..a8aa00c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -53,7 +53,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") + @ApiParam(value = "数量", example = "0") public Double qty; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 70d8791..55ca80d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -100,6 +100,7 @@ public class WmsCSRange extends BaseBean { public WmsCSRange(){} + public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ this.zoneNo = zoneNo; this.partNo = partNo; @@ -117,7 +118,6 @@ public class WmsCSRange extends BaseBean { public WmsCSRange(String zoneNo, String locateNo) { this.zoneNo = zoneNo; this.locateNo = locateNo; - } public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) { From ef971201e39630c9178e18b738f180a652dec6d3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 11 Dec 2020 18:02:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E6=96=B0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 9ff7458..6403216 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -56,4 +56,8 @@ public class MesNumberRule extends BaseBean implements Serializable { @Column(name = "IS_CYCLE") @ApiParam("最大值后循环") private Integer isCycle; + + @Column(name = "SPILT_RULE") + @ApiParam("拼接规则") + private String spiltRule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index ef5c338..f976999 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -135,6 +135,14 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam(value = "包装数量") private Double qty2; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "VERSION_NO") + @ApiParam("版本号") + private String versionNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 94dacc2..03b6571 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -94,6 +94,12 @@ public class GenSerialNoModel { @ApiParam("工序代码") private String processCode; + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("版本号") + private String versionNo; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode;