Merge remote-tracking branch 'origin/test' into test

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

@@ -8243,4 +8243,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DELIVER_ORDER_MOVE_TYPE {
+        SHIPING(10, "发运"),
+        ALLOCATION(20, "发运&调拨");
+
+        private int value;
+        private String description;
+
+        DELIVER_ORDER_MOVE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java

@@ -48,6 +48,10 @@ public class IfDeliverOrderData extends BaseBean implements Serializable {
     @ApiParam("发运数量")
     private Integer qty = 0;
 
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    private Integer moveType;
+
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :BP业务对比表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_BP_BUSINESS")
+@Api("BP业务对比表")
+public class MesBpBusiness extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053666347L;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("预测数量")
+    private Double qty = 0d;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java

@@ -27,4 +27,10 @@ public class LogisticsBiModel implements Serializable {
 
     @ApiParam(value = "月份")
     private Integer month;
+
+    @ApiParam(value = "实际出库数量")
+    private double outQty = 0;
+
+    @ApiParam(value = "BP总数")
+    private double bpQty= 0;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MesBpBusinessRepository extends BaseRepository<MesBpBusiness, Long> {
+}