From dcc23e56cd4a8465337d5c7a2d1ba8d53b551a27 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 13 Jul 2020 16:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94=E7=A4=BAde?=
 =?UTF-8?q?mo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java      | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java       | 6 ++++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 4 ++++
 .../main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java  | 4 +---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java   | 3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
index 218f7f3..36eceaa 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@@ -71,6 +71,10 @@ public class Operation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="CONS_TYPE")
     @ApiParam(value ="接续方式")
     @FieldAnnotation(defaultValue = "ES")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
index 7733715..8f2d668 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -126,6 +127,11 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String lockTime;
 
+    @ApiParam(value ="是否存在任务冲突")
+    @FieldAnnotation(property = false)
+    @Transient
+    private boolean hasConflict;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index 48ace75..9fab094 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@@ -57,6 +57,10 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java
index 481eb3e..112618a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java
@@ -3,16 +3,14 @@ package cn.estsh.i3plus.pojo.aps.model;
 import lombok.Data;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Data
 public class ShiftReportModel {
     private List<String> dates = new ArrayList<>();
     private List<String> headers = new ArrayList<>();
-    private Set<String> labels = new HashSet<>();
+    private List<String> labels = new ArrayList<>();
 
     private List<Map<String, List<String>>> datas = new ArrayList<>();
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 43ae439..99a8d8f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -709,7 +709,8 @@ public class ApsEnumUtil {
         NONE("NONE", "不分割"),
         RATIO("RATIO", "按比例分割"),
         COUNT("COUNT", "按数量分割"),
-        BATCH("BATCH", "按批量分割");
+        BATCH("BATCH", "按批量分割"),
+        REMAINDER("REMAINDER", "按余数分割");
 
         private String value;
         private String description;