From 98afecf57b06932e5531775130e55da5293b4da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 28 Aug 2020 11:12:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=9010877=2019048-=E9=A2=84=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E7=9C=8B=E6=9D=BF=E5=8F=8A=E6=93=8D=E4=BD=9C=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E5=8F=98=E6=9B=B4=E8=B0=83=E6=95=B4-20200828=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/MesPackage.java | 17 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 17e6815..dce964b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -98,6 +98,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; + @Column(name = "IN_LOCATION_TIME") + @ApiParam("入库时间") + private String inLocationTime; + @Transient @ApiParam("封箱状态") private String sealStatus; @@ -140,6 +144,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("目标库位代码") private String destLocationCode; + @Transient + @ApiParam("不良处理类型") + private String defectActionType; + public MesPackage() { } @@ -150,4 +158,13 @@ public class MesPackage extends BaseBean implements Serializable { this.qty = qty; this.packSpecQty = packSpecQty; } + + public MesPackage(String partNo, String partNameRdd,String packageNo, Double qty, String defectActionType, String createDatetime) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.packageNo = packageNo; + this.qty = qty; + this.defectActionType = defectActionType; + this.createDatetime = createDatetime; + } } 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 98adfc4..7ad424d 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 @@ -67,6 +67,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("配置代码") private String prodCfgCode; + @Column(name = "IS_SMALL_SIZE") + @ApiParam("是否小尺寸物料") + private Integer isSmallSize = 1; + @Transient @ApiParam("物料名称") private String partName; From f4d7e55f05cb8f0277c401480ba31a97e64d9a44 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 28 Aug 2020 14:59:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=96=B7=E6=B6=82=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 793f30f..aebd2e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -46,6 +46,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam("方法代码") private String methodCode; + @Column(name = "BATCH_METHOD_CODE") + @ApiParam("批量方法代码") + private String batchMethodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 4b08276..776a6ea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -39,6 +39,10 @@ public class MesMethod extends BaseBean implements Serializable { @ApiParam("方法名称") private String methodName; + @Column(name = "BATCH_METHOD_CODE") + @ApiParam("批量方法名称") + private String batchMethodCode; + @Column(name = "CALL_CLASS") @ApiParam("具体实现类") private String callClass; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java index abf1eff..45ed828 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -19,6 +20,9 @@ public class MesPaintSnPrintModel implements Serializable { @ApiParam("过程条码") private String serialNumber; + @ApiParam("过程条码数组") + private List serialNumberList; + @ApiParam("产品条码") private String produceSn; From df6f0bb4f29f9694d3c1cad1d4f0decc5ab4cd55 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 28 Aug 2020 15:03:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 776a6ea..4b08276 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -39,10 +39,6 @@ public class MesMethod extends BaseBean implements Serializable { @ApiParam("方法名称") private String methodName; - @Column(name = "BATCH_METHOD_CODE") - @ApiParam("批量方法名称") - private String batchMethodCode; - @Column(name = "CALL_CLASS") @ApiParam("具体实现类") private String callClass;