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

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

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

@@ -1211,7 +1211,7 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
         PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
         PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
+        CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
         FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;

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

@@ -1966,7 +1966,8 @@ public class MesEnumUtil {
         SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
-        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入");
+        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
+        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
 
         private int value;
         private String service;
@@ -5564,14 +5565,15 @@ public class MesEnumUtil {
 
 
     /**
-     * 运算对象代码
+     * 运算对象代码 Period capacity
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
         ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
         ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
         WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
-        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"),
+        PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能");
 
         private String value;
         private String description;
@@ -6833,4 +6835,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_GRADE {
+
+        COMMON(10, "普通工位"),
+        MONITOR(20, "监控工位");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -4566,4 +4566,23 @@ public class MesPcnEnumUtil {
 
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PTL_IS_LIGHT {
+
+        IS_PICK_LIGHT(10, "不需亮灯");
+
+        private int value;
+        private String description;
+
+        MES_PTL_IS_LIGHT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
 }

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

@@ -300,6 +300,62 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 单据主表状态(ASN,PO,MOVE,QC,SO)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_MASTER_ORDER_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "已生成"),
+        FAILED(30, "RECEIPT_FINISH", "生成失败");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PICKING_MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 收货状态
      */
@@ -8828,4 +8884,80 @@ public class WmsEnumUtil {
             return description;
         }
     }
+
+
+    /**
+     * BOM
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_PRODUCTING_LINE {
+        GJ(10, "PIPE", "管件"),
+        JF(20, "JF", "夹方"),
+        JH(30, "JH", "机焊"),
+        SH(40, "SH", "手焊");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        BOM_PRODUCTING_LINE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public static String valueOf(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 static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BOM_PRODUCTING_LINE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -0,0 +1,81 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PART_PULL")
+@Api("IF_物料拉动")
+public class IfPartPull extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("产品物料编码")
+    private String parentPartNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子物料编码")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("拉动数量")
+    private Double qty;
+
+    @Column(name = "ORGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    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/MesBoardPlanCapacity.java

@@ -66,7 +66,7 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
 
     @Column(name = "STOP_TIME")
     @ApiParam("停机时间")
-    private Integer stopTime;
+    private Double stopTime;
 
     @Column(name = "ACTUAL_CAPACITY")
     @ApiParam("今日产量")

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

@@ -86,6 +86,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -139,4 +139,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("分类名称")
     private String categoryName;
+
+    @Transient
+    @ApiParam("拉动数量")
+    private Double pullQty;
 }

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

@@ -47,4 +47,12 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @Column(name = "PART_SN")
     @ApiParam("料箱条码")
     private String partSn;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Double targetPassRate;
+
+    @Column(name = "PRIORITY_ORDER")
+    @ApiParam("优先级顺序")
+    private Integer priorityOder;
 }

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

@@ -66,6 +66,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工作单元端口")
     private String workCellPort;
 
+    @Column(name = "GRADE")
+    @ApiParam("工作等级")
+    private Integer grade;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Double targetPassRate;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -71,6 +71,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("工位监控模式")
     private Integer monitorType;
 
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("节拍")
+    private Integer planTakt;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -20,11 +20,8 @@ public class BiModel {
     @ApiParam("工作中心名称")
     private String workCenterName;
 
-    @ApiParam("生产区域代码")
-    private String areaCode;
-
-    @ApiParam("运行状态")
-    private String runningStatus;
+    @ApiParam("工作单元代码")
+    private String workCellCode;
 
     @ApiParam(value = "物料号")
     private String partNo;
@@ -35,12 +32,6 @@ public class BiModel {
     @ApiParam(value = "计划数量")
     private double planQty;
 
-    @ApiParam(value = "产量")
-    private double outputQty;
-
-    @ApiParam(value = "完成率")
-    private double completeRate;
-
     @ApiParam(value = "合格数量")
     private double passQty = 0;
 
@@ -59,6 +50,18 @@ public class BiModel {
     @ApiParam(value = "警戒值")
     private double sentinelValue;
 
+    @ApiParam(value = "总数")
+    private double total;
+
+    @ApiParam(value = "合格数")
+    private double qualifiedQty = 0;
+
+    @ApiParam(value = "不合格数")
+    private double unQualifiedQty = 0;
+
+    @ApiParam("目标合格率")
+    private double targetPassRate;
+
     @ApiParam("客户代码")
     private String customerCode;
 
@@ -76,14 +79,4 @@ public class BiModel {
 
     @ApiParam("列名")
     private Map<String, String> colMap;
-
-    @Deprecated
-    public double getCompleteRate() {
-        if (this.planQty != 0) {
-            this.completeRate = outputQty / planQty;
-        } else {
-            this.completeRate = 0;
-        }
-        return this.completeRate;
-    }
 }

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

@@ -41,6 +41,28 @@ public class BoardModel {
     @ApiParam("当天停机时间(min)")
     private String theDayShutDownTime;
 
+
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @ApiParam("停机时间")
+    private double stopTime;
+
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @ApiParam("计划节拍")
+    private Integer planTakt = 0;
+
+    @ApiParam("今日完成产量")
+    private Integer completeCapacity = 0;
+
+    @ApiParam("时段产能")
+    private Integer periodCapacity = 0;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
 

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

@@ -25,4 +25,10 @@ public class DataReviewModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("是否合格标识")
+    private Integer reviewFlag;
+
+    @ApiParam("是否合格")
+    private String reviewResult;
+
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
 /**
  * @Description:
  * @Author: jokelin
@@ -24,10 +25,10 @@ public class OperateObjectParamModel {
     private String oeeDate;
 
     @ApiParam("开始日期")
-    private String startDate;
+    private String startDatetime;
 
     @ApiParam("结束日期")
-    private String endDate;
+    private String endDatetime;
 
     @ApiParam("开始时段")
     private String startTime;

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

@@ -63,6 +63,12 @@ public class ProdPackModel implements Serializable {
     @ApiParam("是否封箱")
     public Integer isSealed;
 
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
     public ProdPackModel() {
     }
 

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfPartPull;
+import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData;
+
+/**
+ * @Description :
+ * @Reference :
+ * @CreateDate : 2020-04-21 09:53
+ * @Modify:
+ **/
+public interface IfPartPullRepository extends BaseRepository<IfPartPull, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -119,6 +119,12 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "工厂代码")
     private String organizeCode;
 
+    @ApiParam(value = "提交模式")
+    private Integer commitMode;
+
+    @ApiParam(value = "是否允许重置")
+    private Integer isResetAble;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java

@@ -30,8 +30,7 @@ public class WmsFieldInfoModel implements Serializable {
     @ApiParam("处理类型")
     private int handleType;
 
-    public WmsFieldInfoModel (String baseRepository, int handleType, List<WmsFieldInfo> wmsFieldInfoList) {
-        this.baseRepository = baseRepository;
+    public WmsFieldInfoModel ( int handleType, List<WmsFieldInfo> wmsFieldInfoList) {
         this.wmsFieldInfoList = wmsFieldInfoList;
         this.handleType = handleType;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isAutoCommit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false)
+    @ApiParam(value = "是否允许重置")
+    @AnnoOutputColumn
+    private Integer isResetAble;
+
     @Lob
     @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
@@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
 
-    public int geSubmitStepSeqVal() {
+    public int getSubmitStepSeqVal() {
         return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue();
     }
+
+    public int getIsResetAbleVal() {
+        return this.isResetAble == null ? 0 : this.isResetAble.intValue();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -179,6 +179,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+
+    @Column(name = "DEST_XB_ZONE_NO")
+    @ApiParam("目的线边存储区代码")
+    public String destXBZoneNo;
+
     @Column(name = "LOT_NO")
     @ApiParam("批次")
     public String lotNo;
@@ -231,6 +236,7 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "父位置号")
     private String seqNo;
 
+
     @Transient
     @ApiParam(value = "客户编号")
     private String custNo;
@@ -385,7 +391,7 @@ public class WmsDocMovementDetails extends BaseBean {
     public String refSrc;
 
     @Transient
-    @ApiParam("工作中心代码")
+    @ApiParam("产线代码")
     private String workCenterCode;
 
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -46,7 +46,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "ORDER_NO")
     @ApiParam(value = "移库单单号")
     private String orderNo;
-    /**
+    /**e
      * 移动类型:IN=入库,OUT=出库,MOVE=移库
      */
     @Column(name = "MOVE_TYPE")
@@ -231,6 +231,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "备注1")
     private String remake;
 
+
+    /**
+     * 10=未生成，20=生成成功，30=生成失败
+     */
+    @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10")
+    @ApiParam(value = "领料单生成状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickingOrderStatus;
+
     @Column(name = "SECONDARY_REMAKE")
     @ApiParam(value = "备注2")
     private String secondaryRemake;