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 fbf2d06..8ffab7a 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 @@ -1908,7 +1908,8 @@ public class MesEnumUtil { MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"), ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), - SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"); + SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), + MES_WORK_ORDER_PAINT_ZS(490, "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 e46dec6..d2b83c3 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 @@ -271,6 +271,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { public Map extendMap; + @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; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index aa9bd67..f7fbfb9 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -46,7 +46,7 @@ public class BsSuitCaseFTP extends BaseBean { @Column(name = "FILE_ENCODE") @ApiParam(value = "文件编码") - private String fileEncode; + private Integer fileEncode; @Column(name = "IS_TRANSFORM_MESSAGE") @ApiParam(value = "是否转换报文") @@ -98,6 +98,18 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); } + @Column(name = "IS_INCREMENTAL_WRITE") + @ApiParam(value = "是否增量写入") + private Integer isIncrementalWrite; + + public int getIsIncrementalWriteVal(){ + return isIncrementalWrite == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isIncrementalWrite; + } + + public boolean isIncrementalWrite() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); + } + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath;