From 5f495a1b98f64b5f7cfafc1f26106dd54c3bd866 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 19 Aug 2020 15:42:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index 1b57111..ed640d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -59,6 +59,4 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @ApiParam("工作中心名称") - private String workCenterName; } From b56cf991be126a6741f8492168b7fdb079052d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 19 Aug 2020 20:08:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=902607=2008=20ext=20PCR-200623001?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4-=E9=A2=84=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 839c6e8..6c41884 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -36,7 +36,11 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "MIN_CAPACITY") @ApiParam("最小库存") - private Integer minCapacity; + private Integer minCapacity = 0; + + @Column(name = "MAX_CAPACITY") + @ApiParam("最大库存") + private Integer maxCapacity = 0; @Column(name = "TOTAL_CAPACITY") @ApiParam("总容量") From 9299f17c3bacea31df94181fe906d8792a32c427 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 19 Aug 2020 20:42:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Fix=20bug#10671=20=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7=E6=89=AB=E6=8F=8F=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=20--2020?= =?UTF-8?q?0821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 2eb3864..0e69083 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -76,6 +76,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seq = 0; + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String remark; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } From f275d70136d4b000a664c23968c82ec10bae2427 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 19 Aug 2020 23:15:47 +0800 Subject: [PATCH 4/4] Fix Bug #10674 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java index 4d2528a..7d1c6f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java @@ -36,4 +36,7 @@ public class Head implements Serializable { @XStreamAlias("status") private String status; + @XStreamAlias("vehicleName") + private String vehicleName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index f6024e5..b060637 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -25,6 +25,9 @@ public class Part implements Serializable { @XStreamAlias("qty") private String qty; + @XStreamAlias("componentGroup") + private String componentGroup; + @ApiParam("是否是baseModule") private boolean isBaseModule; @@ -49,7 +52,6 @@ public class Part implements Serializable { @ApiParam("配方顺序") private String recipeSeq; - @ApiParam("Mes物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java index c1d74b6..846bec2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -36,7 +37,7 @@ public class Pn implements Serializable { private List parts; @XStreamAlias("optioncode") - private List codeRules; + private List codeRules = new ArrayList<>(); @ApiParam("新vin号") private String newVin;