From 5bc9b9b0828337bf60ca54088e7e0cb32076a49d Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 16:16:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 10 +++++++++- 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cd3143f..0508600 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -21,7 +21,8 @@ public class MesEnumUtil { DEFECT("DEFECT", "缺陷"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), - REPAIR("REPAIR", "处理措施"); + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index afecb21..f93a37f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private Integer qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java index a53a8b5..82c0944 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description: @@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private BigDecimal qty; @Column(name = "UNIT") @ApiParam("单位") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 71f7100..27ef471 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private Integer qty; @Column(name = "PACKAGE_NO2") @ApiParam("包装编号2") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 2309dbe..b46da7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description: @@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean { @Column(name = "QTY") @ApiParam("数量") - private String qty; + private BigDecimal qty; @Column(name = "UNIT") @ApiParam("单位") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 12280a7..12ae9a6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -52,4 +52,8 @@ public class MesPartObject extends BaseBean { @Transient @ApiParam("字段总数") private Integer fieldNum; + + @Transient + @ApiParam("数据组号") + private String groupNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 1f62898..3555f12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -45,9 +45,17 @@ public class MesProductData extends BaseBean { private String workCellName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; From 4146126284aa8c185f9f79b2456cefe10e4c1db0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 22 Nov 2019 16:41:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1202?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/SnPrintDataModel.java | 2 +- .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 2 +- .../pojo/mes/pcn/model/SnPrintValueModel.java | 72 ---------------------- .../pojo/mes/pcn/model/StepPrintSnModel.java | 3 + 4 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java index 7a2c56b..831a997 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java @@ -19,7 +19,7 @@ import java.util.List; public class SnPrintDataModel { @ApiParam("打印数据") - private List valueList; + private List valueList; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java index 5f65795..0f1d4a6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java @@ -13,7 +13,7 @@ import lombok.Data; **/ @Data @Api("打印信息汇总") -public class SnPrintModel extends SnPrintValueModel { +public class SnPrintModel extends StepPrintSnModel { @ApiParam("过程条码") private SnPrintDataModel serialPrintDataModel; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java deleted file mode 100644 index d3e47e4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息 - * @Reference: - * @Author: wangjie - * @CreateDate:2019-08-27-13:24 - * @Modify: - **/ -@Data -@Api("打印信息") -public class SnPrintValueModel extends MesProduceSn { - @ApiParam("打印描述") - private String printDesc; - - @ApiParam("条码") - private String barCode; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("批次号") - private String batchNo; - - @ApiParam("箱数量") - private String boxQty; - - @ApiParam("订单号") - private String orderNo; - - @ApiParam("生产日期") - private String productionTime; - - @ApiParam("包装编码") - private String packageNo; - - @ApiParam("包装规格") - private String packageSpec; - - @ApiParam("供应商") - private String supplier; - - @ApiParam("客户名称") - private String customerName; - - @ApiParam("客户零件号") - private String customerPartNo; - - @ApiParam("客户物料名称") - private String customerPartName; - - @ApiParam("物料名称") - private String partNameRdd; - - @ApiParam("单位") - private String unit; - - @ApiParam("特殊批号") - private String fixLotNo; - - @ApiParam("生产工单号") - private String workOrderNo; - - @ApiParam("生产线代码") - private String workCenterCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 53b974e..c128bbb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -72,4 +72,7 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("生产线代码") private String workCenterCode; + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + }