diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java index 764b522..874ed08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -8,18 +8,18 @@ import lombok.Data; import java.util.List; /** - * @Description: 打印信息封装模板 + * @Description: 打印信息封装 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息封装模板") +@Api("打印信息封装") public class SnPrintDataModel { @ApiParam("打印数据") - private List snPrintValueModel; + private List valueList; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java index 47c87a9..bb2620a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java @@ -5,23 +5,23 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @Description: 条码补打印 + * @Description: 打印信息汇总 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息模板") +@Api("打印信息汇总") public class SnPrintModel extends SnPrintValueModel { @ApiParam("过程条码") - private SnPrintDataModel snPrintModel; + private SnPrintDataModel serialPrintDataModel; @ApiParam("产品条码") - private SnPrintDataModel prodPrintModel; + private SnPrintDataModel prodPrintDataModel; @ApiParam("包装条码") - private SnPrintDataModel packagePrintModel; + private SnPrintDataModel packPrintDataModel; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java index a26ac51..42dbbea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java @@ -6,14 +6,14 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @Description: 条码补打印 + * @Description: 打印信息 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息模板") +@Api("打印信息") public class SnPrintValueModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc;