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

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

@@ -2056,7 +2056,7 @@ public class MesEnumUtil {
         MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"),
         MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"),
         MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
-        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
+        MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表，支持编辑"),
         MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
         MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
         MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"),

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

@@ -0,0 +1,66 @@
+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;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :IF_订单交付数据
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_DELIVER_ORDER_DATA")
+@Api("IF_订单交付数据")
+public class IfDeliverOrderData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053695347L;
+
+    @Column(name = "RGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String rganiztionCode;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("发运数量")
+    private Integer qty = 0;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -172,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.createDatetime = createDatetime;

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/28 2:37 下午
+ * @Modify:
+ */
+@Data
+public class LogisticsBiModel implements Serializable {
+
+    @ApiParam(value = "去年每月发运数量")
+    private double lastQty = 0;
+
+    @ApiParam(value = "今年每月发运数量")
+    private double thisQty = 0;
+
+    @ApiParam(value = "比例值")
+    private double annualRatio = 0;
+
+    @ApiParam(value = "月份")
+    private Integer month;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.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.IfDeliverOrderData;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface IfDeliverOrderDataRepository extends BaseRepository<IfDeliverOrderData, Long> {
+}