From f90371f63281557ec0196dbf2585c070914d4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 21 Jun 2020 14:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=902144=2006=201.2.4.6.1.3=20=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7=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 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) 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 cc97315..e992adc 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 @@ -1905,7 +1905,8 @@ public class MesEnumUtil { MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), - MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), + MES_WORK_ORDER_PAINT_ZS(460, "planZSOrderExcelService", "生产工单-注塑"); private int value; private String service; 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 fb6c793..141f713 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 @@ -123,4 +123,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "VIN_CODE") @ApiParam("vin") private String vinCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d09d54d..a83b4a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -272,6 +272,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "完成按钮编号") public String comButtonCode; + @Transient + @ApiParam("工单源序号") + private Double srcSeq; + + @Transient + @ApiParam("零件号集合") + private String partNoList; + + @Transient + @ApiParam("零件名称集合") + private String partNameList; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; }