From 7a502c45c961aae100c1bd6159a92120547ebaa1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 25 Aug 2020 20:54:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E4=B8=8A=E6=96=99=20?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java index 8820837..7148de0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java @@ -20,6 +20,9 @@ public class InjectionFeedingModel { @ApiParam("原材料物料号") private String partNo; + @ApiParam("原材料物料名称") + private String partName; + @ApiParam("是否锁定：1=是，2=否") private Integer lockFlag; From ac55ae1df17bd3e80a8925a7c7329f294d224303 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 26 Aug 2020 09:46:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 5 +++++ 1 file changed, 5 insertions(+) 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 6c41884..98adfc4 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -65,4 +66,8 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "PROD_CFG_CODE") @ApiParam("配置代码") private String prodCfgCode; + + @Transient + @ApiParam("物料名称") + private String partName; } From d63d07ad7ea1023132418973ece8519244959400 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 26 Aug 2020 10:10:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=94=B6?= =?UTF-8?q?=E8=B4=A7BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 37ae66f..5e2a4b1 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 @@ -857,7 +857,8 @@ public class WmsEnumUtil { CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), - OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料"); + OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), + OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"); private int value; private String code;