mes生产计划

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

@@ -100,6 +100,11 @@ public class MesPlanOrder extends BaseBean {
     private String workCenterCode;
 
     /**********************  冗余字段 *********************************/
+
+    @Transient
+    @ApiParam(value="区域")
+    public String areaCode;
+
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@@ -122,21 +127,6 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
-    }
-
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> getPlanOrderStatusEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values());
-    }
-
     public double getPlanQtyVal() {
         return this.planQty == null ? 0.0d : this.planQty;
     }

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}

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

@@ -125,6 +125,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")

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

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入异常结果model")
+@Api("mes导入异常结果model")
-public class MesPlanOrderExcelErrorModel implements Serializable {
+public class MesExcelErrorModel implements Serializable {
 
     @ApiParam("错误的行号")
     private int rowNum;

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

@@ -18,22 +18,25 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入结果model")
+@Api("mes导入结果model")
-public class MesPlanOrderExcelResultModel implements Serializable {
+public class MesExcelResultModel<T> implements Serializable {
 
     @ApiParam("结果")
     private boolean result;
 
-    @ApiParam("成功数量")
+    @ApiParam("成功行数量")
-    private int successNum;
+    private int successRowNum;
 
-    @ApiParam("失败数量")
+    @ApiParam("失败行数量")
-    private int errorNum;
+    private int failRowNum;
 
     @ApiParam("错误信息集合")
-    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+    private List<MesExcelErrorModel> mesExcelErrorModel;
 
     @ApiParam("错误的行号")
     private String errorRows;
 
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
+}