From f4d7e55f05cb8f0277c401480ba31a97e64d9a44 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 28 Aug 2020 14:59:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E6=B6=82=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=8A=A5=E9=94=99?= =?UTF-8?q?bug=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;