Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -7,6 +7,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -46,4 +47,9 @@ public class DayShift extends BaseAPS {
     @FieldAnnotation(notEmpty = true)
     @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class})
     private String workTimes;
+
+    @Column(name="COLOR")
+    @ApiParam(value ="颜色")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER)
+    private String color;
 }

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

@@ -61,8 +61,4 @@ public class HeuristicRule extends BaseRule {
     @Column(name="WORK_GROUP_INTERVAL")
     @ApiParam(value ="工作分组间隔")
     private String workGroupInterval;
-
-    @Column(name="REVER_FLUSH_PLAN")
-    @ApiParam(value ="逆向刷新计划")
-    private Boolean reverFlushPlan = false;
 }

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :资源甘特图资源表格
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-07-27
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_RES_GANTT_TABLE")
+@Api("资源甘特图资源表格")
+public class ResGanttTable extends BaseAPS {
+    private static final long serialVersionUID = -8818717728985340196L;
+
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
+    @Column(name="DISPLAY")
+    @ApiParam(value ="是否在界面显示")
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean display = true;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(value ="序号")
+    private Integer orderNumber;
+
+    private transient ApsEnumUtil.FIELD_TYPE type;
+
+    private transient ApsEnumUtil.EDIT_TYPE editType;
+
+    @ApiParam(value ="枚举项内容")
+    private transient Enum<?>[] enumItems;
+}

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

@@ -61,4 +61,8 @@ public class SysParam extends BaseAPS {
     @Column(name="SPLIT_BY_SHIFT")
     @ApiParam(value ="按班次分割下发的工作")
     private Boolean splitByShift;
+
+    @Column(name="RES_GANTT_LABEL")
+    @ApiParam(value ="资源甘特图工作块显示标签")
+    private String resGanttLabel;
 }

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

@@ -182,7 +182,7 @@ public class Work extends BaseAPS {
 
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
-    private transient boolean hasOptimized = false;
+    private transient boolean supplyCount = false;
 
     // 排程时确定工作是正向排程还是逆向排程。
     private transient boolean positive = true;

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

@@ -24,4 +24,5 @@ public class GanttPlanModel {
     private Long workId;
     private List<Long> resIds;
     private Boolean draggable;
+    private Boolean furnacePlan = false;
 }

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

@@ -22,4 +22,8 @@ public class KPIModel {
     private String settingTimes;
 
     private Integer overdueSalesCount;
+
+    private Integer avaliableResCount;
+
+    private Integer stopResCount;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ResGanttTable;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ResGanttTableRepository extends CrudRepository<ResGanttTable, Long> {
+}

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

@@ -1037,7 +1037,8 @@ public class ApsEnumUtil {
         OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
         LIST("LIST", "对象集合，不可编辑。"),
         MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"),
-        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项");
+        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"),
+        COLOR_PICKER("COLOR_PICKER", "颜色选择框");
 
         private String value;
         private String description;

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

@@ -1882,7 +1882,8 @@ public class WmsEnumUtil {
     public enum QC_ITEM_STATUS {
         NORMAL(10, "正常"),
         CANCELLATION(20, "已处理"),
-        SPECIAL(30, "部分特采");
+        SPECIAL(30, "部分特采"),
+        XUANBIE(40, "选别");
 
         private int value;
         private String description;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java

@@ -241,4 +241,10 @@ public class WmsCSOrderDetails extends BaseBean {
         this.partNo=partNo;
         this.partNameRdd = partNameRdd;
     }
+    public WmsCSOrderDetails(String organizeCode,String partNo,String locateNo, Double qty) {
+        this.organizeCode=organizeCode;
+        this.partNo = partNo;
+        this.locateNo = locateNo;
+        this.qty = qty;
+    }
 }