生产计划

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

@@ -459,6 +459,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -88,7 +88,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -95,6 +95,10 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     /**********************  冗余字段 *********************************/
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -102,7 +102,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入异常结果model")
+public class MesPlanOrderExcelErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入结果model")
+public class MesPlanOrderExcelResultModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功数量")
+    private int successNum;
+
+    @ApiParam("失败数量")
+    private int errorNum;
+
+    @ApiParam("错误信息集合")
+    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -77,6 +77,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
 
         // 时间段查询
         DdlPreparedPack.timeBuilder(