新增报工功能

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.validator.ImportGroup;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import io.swagger.annotations.Api;
@@ -43,6 +44,6 @@ public class DayShift extends BaseAPS {
     @Column(name="WORK_TIMES")
     @ApiParam(value ="工作时间")
     @FieldAnnotation(notEmpty = true)
-    @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class})
+    @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class})
     private String workTimes;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java

@@ -90,6 +90,10 @@ public class Operation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
+    @Column(name="MANU_OPER")
+    @ApiParam(value ="是否手工工序")
+    private Boolean manuOper;
+
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EOperation.ProductRouting);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java

@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -30,6 +31,7 @@ import java.util.List;
 @Api("日历")
 public class ResCalendar extends BaseAPS {
     private static final long serialVersionUID = 8338930205816433211L;
+    @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -73,6 +73,10 @@ public class StandOperation extends BaseAPS {
     @FieldAnnotation(relation = "WorkShop")
     private Long workShopId;
 
+    @Column(name="TYPE")
+    @ApiParam(value ="工序类型")
+    private ApsEnumUtil.SANLUX_OPERATION_TYPE type;
+
     public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportDataModel.java

@@ -23,5 +23,8 @@ public class ImportDataModel {
 
     private Boolean finish = false;
 
+    @ApiParam(value ="异常消息")
+    private String exception = "";
+
     private ImportErrorInfo errorInfo;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ImportGroup.java

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.validator;
+
+public interface ImportGroup {
+}