Finish Task #2134 Cost: 8h

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -388,9 +388,11 @@ public class BeanRelation {
 
         List<BaseBean> relaBeans = list(bean, holders[index]);
         for (BaseBean relaBean : relaBeans) {
+            if (relaBean.getId() != bean.getId()) {
                 recursionImpl(relaBean, fun, holders, index + 1);
             }
         }
+    }
 
     /**
      * 判断target是否为bean为起点的以holders路径上的点。

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

@@ -1,5 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -14,6 +18,10 @@ import java.util.Date;
  **/
 @Data
 public class DelaySalesOrder {
+
+    @ApiParam(value ="订单ID")
+    private Long orderId;
+
     @ApiParam(value ="订单编码")
     private String orderCode;
 
@@ -30,12 +38,18 @@ public class DelaySalesOrder {
     private Double count;
 
     @ApiParam(value ="最晚结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date let;
 
     @ApiParam(value ="计划开始时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planStart;
 
     @ApiParam(value ="计划结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planEnd;
 
     @ApiParam(value ="总跨度时间")

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

@@ -1,5 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -14,6 +18,9 @@ import java.util.Date;
  **/
 @Data
 public class LargeSpanOrder {
+    @ApiParam(value ="订单ID")
+    private Long orderId;
+
     @ApiParam(value ="订单编码")
     private String orderCode;
 
@@ -30,12 +37,18 @@ public class LargeSpanOrder {
     private Double count;
 
     @ApiParam(value ="最晚结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date let;
 
     @ApiParam(value ="计划开始时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planStart;
 
     @ApiParam(value ="计划结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planEnd;
 
     @ApiParam(value ="总跨度时间")

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

@@ -1,5 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,24 +18,43 @@ import java.util.Date;
  **/
 @Data
 public class MaterialDeliveryAnalyze {
+    @ApiParam(value ="订单ID")
+    private Long orderId;
 
+    @ApiParam(value ="订单编码")
     private String orderCode;
 
+    @ApiParam(value ="订单名称")
     private String orderName;
 
+    @ApiParam(value ="物料编码")
     private String materialCode;
 
+    @ApiParam(value ="物料名称")
     private String materialName;
 
+    @ApiParam(value ="标签名称")
     private String labelName;
 
+    @ApiParam(value ="标签颜色")
     private String labelColor;
 
+    @ApiParam(value ="需求数量")
+    private Double requireCount;
+
+    @ApiParam(value ="需求日期")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date requireDate;
 
+    @ApiParam(value ="最早到货日期")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date arrivalDate;
 
-    private Double requireCount;
+    // 0正常显示，1显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
 
     private Double count;
 }

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

@@ -1,5 +1,9 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -14,6 +18,9 @@ import java.util.Date;
  **/
 @Data
 public class PrematureProduct {
+    @ApiParam(value ="订单ID")
+    private Long orderId;
+
     @ApiParam(value ="订单编码")
     private String orderCode;
 
@@ -30,12 +37,18 @@ public class PrematureProduct {
     private Double count;
 
     @ApiParam(value ="最晚结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date let;
 
     @ApiParam(value ="计划开始时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planStart;
 
     @ApiParam(value ="计划结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date planEnd;
 
     @ApiParam(value ="提前完成时间")

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 排程结果分析及建议
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class ScheduleAnalyze {
+
+    @ApiParam(value ="工作编码")
+    private String workCode;
+
+    @ApiParam(value ="数量")
+    private Double count;
+
+    @ApiParam(value ="计划开始时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date planEnd;
+
+    @ApiParam(value ="问题描述")
+    private String describe;
+
+    @ApiParam(value ="解决方案")
+    private String solution;
+}