Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -1841,7 +1841,7 @@ public class MesEnumUtil {
         MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"),
         MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"),
         MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"),
-        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制");
+        MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制，支持编辑");
 
         private int value;
         private String service;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -162,11 +162,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private String reserved2;
 
     @Column(name = "RESERVED3")
-    @ApiParam("预留字段13")
+    @ApiParam("预留字段3")
     private String reserved3;
 
     @Column(name = "RESERVED4")
-    @ApiParam("预留字段14")
+    @ApiParam("预留字段4")
     private String reserved4;
 
     @Column(name = "RESERVED5")
@@ -178,18 +178,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
-    @Column(name = "CATEGORY_CODE1")
-    @ApiParam("类型1")
-    private String categoryCode1;
-
-    @Column(name = "CATEGORY_CODE2")
-    @ApiParam("类型2")
-    private String categoryCode2;
-
-    @Column(name = "CATEGORY_CODE3")
-    @ApiParam("类型3")
-    private String categoryCode3;
-
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java

@@ -151,6 +151,26 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 
+    @Column(name = "RESERVED1")
+    @ApiParam("预留字段1")
+    private String reserved1;
+
+    @Column(name = "RESERVED2")
+    @ApiParam("预留字段2")
+    private String reserved2;
+
+    @Column(name = "RESERVED3")
+    @ApiParam("预留字段3")
+    private String reserved3;
+
+    @Column(name = "RESERVED4")
+    @ApiParam("预留字段4")
+    private String reserved4;
+
+    @Column(name = "RESERVED5")
+    @ApiParam("预留字段5")
+    private String reserved5;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileDetailModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 生产计划批量编制明细model
+ * @Author: wangjie
+ * @Date: 2020/4/21 6:55 下午
+ * @Modify:
+ */
+@Data
+public class ProdPlanBatchCompileDetailModel {
+
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("日期对应到数量")
+    private Double qty;
+
+    @ApiParam("是否只读")
+    private Boolean readonly;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("完成数量的颜色")
+    private String color;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 生产计划批量编制model
+ * @Author: wangjie
+ * @Date: 2020/4/21 6:55 下午
+ * @Modify:
+ */
+@Data
+public class ProdPlanBatchCompileModel {
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("预留字段1")
+    private String reserved1;
+
+    @ApiParam("预留字段2")
+    private String reserved2;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "班组名称")
+    public String shiftGroupName;
+
+    @ApiParam(value = "班次名称")
+    public String shiftName;
+
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("客户名称")
+    private String custCodeName;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @ApiParam("预留字段3")
+    private String reserved3;
+
+    @ApiParam("预留字段4")
+    private String reserved4;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("日期数量集合")
+    private List<ProdPlanBatchCompileDetailModel> detailList;
+
+    @ApiParam("合计")
+    private Double amount;
+
+    @ApiParam("完成合计")
+    private Double completeAmount;
+
+    @ApiParam("计划类型")
+    private Integer planType;
+
+    @ApiParam("计划类型名称")
+    private String planTypeName;
+
+}