Start Task #2134 Cost: 8h

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

@@ -143,6 +143,14 @@ public class Material extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String orderBatchPeriod;
 
+    @Column(name="LABEL_NAME")
+    @ApiParam(value ="标签名称")
+    private String labelName;
+
+    @Column(name="LABEL_COLOR")
+    @ApiParam(value ="标签颜色")
+    private String labelColor;
+
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
+@Api("物料")
+public class MaterialDeliveryPromise extends BaseBean {
+    @Column(name="QTY")
+    @ApiParam(value ="到货数量")
+    private Double count;
+
+    @Column(name="DATE_TIME")
+    @ApiParam(value ="到货日期")
+    private Date dateTime;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material", notEmpty = true)
+    private Long materialId;
+
+    public Material getMaterial() {
+        return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
+    }
+
+    public void setMaterial(Material material) {
+        this.materialId = material != null ? material.getId() : 0l;
+        BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
+    }
+}

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

@@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
+    @Column(name="ALLOW_DELAY_TIME")
+    @ApiParam(value ="允许延期时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String allowDelayTime;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

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

@@ -29,6 +29,10 @@ public class DateDuration {
     private double rate = 0.0;
     private boolean bValid = false;
 
+    public DateDuration(int value) {
+        this.time = value;
+    }
+
     public DateDuration(String value) {
         setValue(value);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java

@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EMaterialDeliveryPromise {
+    Material,
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 DelaySalesOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="延期时间")
+    private String delayTime;
+
+    @ApiParam(value ="允许的最大延期时间")
+    private String allowDelayTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 LargeSpanOrder {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单数量")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="总跨度时间")
+    private String overTime;
+
+    @ApiParam(value ="总生产时间")
+    private String productTime;
+
+    @ApiParam(value ="跨度时间")
+    private String spanTime;
+
+    // 0正常显示，1显示黄色，2显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+}

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 物料交期分析表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class MaterialDeliveryAnalyze {
+
+    private String orderCode;
+
+    private String orderName;
+
+    private String materialCode;
+
+    private String materialName;
+
+    private String labelName;
+
+    private String labelColor;
+
+    private Date requireDate;
+
+    private Date arrivalDate;
+
+    private Double requireCount;
+
+    private Double count;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 PrematureProduct {
+    @ApiParam(value ="订单编码")
+    private String orderCode;
+
+    @ApiParam(value ="订单名称")
+    private String orderName;
+
+    @ApiParam(value ="物料编码")
+    private String materialCode;
+
+    @ApiParam(value ="物料名称")
+    private String materialName;
+
+    @ApiParam(value ="订单编码")
+    private Double count;
+
+    @ApiParam(value ="最晚结束时间")
+    private Date let;
+
+    @ApiParam(value ="计划开始时间")
+    private Date planStart;
+
+    @ApiParam(value ="计划结束时间")
+    private Date planEnd;
+
+    @ApiParam(value ="提前完成时间")
+    private String times;
+
+    // 0正常显示，1显示红色
+    @ApiParam(value ="背景显示颜色")
+    private Integer backgroundColor;
+
+}

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

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

modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="MaterialDeliveryPromise">
+    <Relation field="Material" name="Material" type="MULTI_TO_ONE">
+    </Relation>
+</Class>

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

@@ -1110,4 +1110,33 @@ public class ApsEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 订单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STATUS {
+        NOPLAN("NOPLAN", "未计划"),
+        PLANDONE("PLANDONE", "计划完毕"),
+        INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+        CONFIRM("CONFIRM", "确认"),
+        STARTPRODUCT("STARTPRODUCT", "开始生产"),
+        FINISH("FINISH", "完成");
+
+        private String value;
+        private String description;
+
+        ORDER_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }