Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -1962,7 +1962,13 @@ public class CommonEnumUtil {
         }
 
         private String getJDBCUrlMySQL(String database,String host,Integer port){
-            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
+            //TODO 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
+            return "jdbc:mysql://"+host+":"+port+"/"+database+
+                    "?autoReconnect=true" +
+                    "&useSSL=false" +
+                    "&characterEncoding=utf-8" +
+                    "&allowPublicKeyRetrieval=true" +
+                    "&serverTimezone=CST";
         }
 
         private String getJDBCUrlOracle(String database,String host,Integer port){

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

@@ -815,6 +815,8 @@ public class MesEnumUtil {
     public enum MES_TYPE_CFG {
 
         DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),

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

@@ -445,6 +445,8 @@ public class MesPcnEnumUtil {
     public enum MES_TYPE_CFG {
 
         DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
@@ -1180,7 +1182,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_TYPE {
 
-        GET_MES_DATA(1, "pcn获取mes数据"),
+        GET_MES_DATA(1, "pcn拉取mes数据"),
         DATA_TO_MES(2, "pcn推送数据至mes");
 
         private int value;

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

@@ -167,6 +167,14 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @Transient
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Transient
+    @ApiParam("客户名称")
+    private String custName;
+
     public MesPackage() {
     }
 
@@ -198,4 +206,16 @@ public class MesPackage extends BaseBean implements Serializable {
         this.defectActionType = defectActionType;
         this.createDatetime = createDatetime;
     }
+
+    public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
+                      String packageNo, String lotNo, String custCode, String shiftGroup) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.workOrderNo = workOrderNo;
+        this.packageNo = packageNo;
+        this.lotNo = lotNo;
+        this.custCode = custCode;
+        this.shiftGroup = shiftGroup;
+    }
 }

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

@@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable {
     @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam("标准包规数量")
-    private Double partSpecQty;
+    private Double partSpecQty = 0d;
 
     @Column(name = "CATEGORY_CODE1")
     @ApiParam("分类1")
@@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
-    private Integer processMatchType;
+    private Integer processMatchType = 0;
 
     @Column(name = "PACKAGE_MATCH_TYPE")
     @ApiParam("包装编码匹配类型")
-    private Integer packageMatchType;
+    private Integer packageMatchType = 0;
 
     @Column(name = "PRODUCT_MATCH_TYPE")
     @ApiParam("产品编码匹配类型")
-    private Integer productMatchType;
+    private Integer productMatchType = 0;
 
     @Column(name = "PPT_CODE")
     @ApiParam("产品类型代码")
@@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_TRAIT")
     @ApiParam("物料特性")
-    private Integer partTrait;
+    private Integer partTrait = 0;
 
     @Column(name = "COLOR_CODE")
     @ApiParam("颜色代码")
@@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "SHELVES_AMOUNT")
     @ApiParam("挂架数")
-    private Integer shelvesAmount;
+    private Integer shelvesAmount = 0;
 
     @Column(name = "QUANTITY_PER_RACK")
     @ApiParam("挂架可放零件数")
-    private Integer quantityPerRack;
+    private Integer quantityPerRack = 0;
 
     @Column(name = "PAINT_TANK_CODE")
     @ApiParam("供漆罐代码")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -45,4 +46,8 @@ public class MesShiftGroup extends BaseBean implements Serializable {
     @Column(name = "SQUAD_LEADER")
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("班组数")
+    private String count;
 }

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

@@ -26,8 +26,11 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")},
+@Table(name = "MES_WORK_ORDER", indexes = {
-        uniqueConstraints = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WO_STATUS")
+}, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
 })
 @Api("生产工单")
@@ -363,14 +366,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private Integer isFictive = 2;
 
     @Transient
-    @ApiParam("圈数")
-    private Integer rounds;
-
-    @Transient
-    @ApiParam("小车号")
-    private String smallCarNo;
-
-    @Transient
     @ApiParam("行颜色")
     private String rowColor;
 
@@ -390,6 +385,46 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("生产节拍")
     private Integer takt;
 
+    /**********************  动态冗余字段（界面维护大写） *********************************/
+
+    @Transient
+    @ApiParam("基准时间")
+    private String standardDate;
+
+    @Transient
+    @ApiParam("圈数")
+    private Integer rounds;
+
+    @Transient
+    @ApiParam("节拍")
+    private String chainSpeed;
+
+    @Transient
+    @ApiParam("小车号")
+    private String smallCarNo;
+
+    @Transient
+    @ApiParam("小车数量")
+    private String smallCarAmount;
+
+    @Transient
+    @ApiParam("标包")
+    private String standardPackage;
+
+    @Transient
+    @ApiParam("包规代码")
+    private String packageGauge;
+
+    @Transient
+    @ApiParam("反喷标识")
+    private String reverseSprayMark;
+
+    @Transient
+    @ApiParam("模具编号集合")
+    private String mouldCodeList;
+
+
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -15,6 +15,9 @@ public class AssembleDefectModel {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @ApiParam("工单号")
+    private String workOrderNo;
+
     @ApiParam("过程条码")
     private String serialNumber;
 

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

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ *
+ */
+
+/**
+ * @Description: 中航-工位停线原因（取AndonManageQueue数据）
+ * @CreateDate: 2020/11/2
+ * @Author: simon.song
+ */
+@Data
+public class MesAndonManageQueueModel {
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("故障名称")
+    private String acDesc;
+
+    @ApiParam("故障来源")
+    private String workCellNameRdd;
+
+    @ApiParam("安灯类型")
+    private String alarmDetailNameRdd;
+
+    @ApiParam("事件描述")
+    private String ecDesc;
+
+}

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

@@ -30,5 +30,5 @@ public class MesBoardWorkCenterOverviewModel {
     List<MesWorkOrder> workOrderList;
 
     @ApiParam("班组信息")
-    List<MesShiftGroup> shiftGroupList;
+    MesShiftGroup shiftGroup;
 }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 中航-产线状态图
+ * @CreateDate: 2020/11/2
+ * @Author: simon.song
+ */
+@Data
+public class MesBoardWorkCenterStatusModel {
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("实时节拍")
+    private String realTimeTakt;
+
+    @ApiParam("工位状态列表")
+    private List<MesWorkCellStatusModel> workCellStatusList;
+
+    @ApiParam("工位停线原因")
+    private List<MesAndonManageQueueModel> workCellStopLineList;
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MesWorkCellStatusModel {
+
+    @ApiParam("工位运行状态")
+    private String cellStatus;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class MgnBoardAreaYieldModel {
 
@@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel {
     @ApiParam("注塑")
     private MgnBoardListModel injectMoldBoardListModel;
 
+    @ApiParam("组装集合")
+    private List<MgnBoardListModel> assembleBoardListModelList;
+
+    @ApiParam("涂装集合")
+    private List<MgnBoardListModel> paintBoardListModelList;
+
+    @ApiParam("注塑集合")
+    private List<MgnBoardListModel> injectMoldBoardListModelList;
+
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardListColorModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("颜色")
+    private String color;
+
+}

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

@@ -38,10 +38,22 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
-    @ApiParam("异常数量")
+    @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 
+    @ApiParam("响应异常数量")
+    private Integer responseQty;
+
     @ApiParam("正常数量")
     private Integer normalQty;
 
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("车间")
+    private String areaCode;
+
+    @ApiParam("产线集合")
+    private List<MgnBoardListColorModel> workCenterList;
+
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -65,4 +66,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("不良汇总列值")
     private List<Double> defectValueList;
 
+    @Transient
+    @ApiParam("开始工单")
+    private String workOrderNoStart;
+
+    @Transient
+    @ApiParam("结束工单")
+    private String workOrderNoEnd;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -106,7 +106,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;

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

@@ -470,7 +470,8 @@ public class WmsDocMovementDetails extends BaseBean {
     }
 
 
-    public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
+    public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
+        System.out.println("=======参数方法");
         this.createDatetime = createDatetime;
         this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
@@ -478,6 +479,7 @@ public class WmsDocMovementDetails extends BaseBean {
         this.itemStatus= itemStatus;
         this.orderNo = orderNo;
         this.partNo=partNo;
+        this.srcZoneNo = srcZoneNo;
     }
 
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {

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

@@ -162,6 +162,10 @@ public class WmsPOMasterDetails extends BaseBean {
     private String dateCode;
 
     @Transient
+    @ApiParam(value = "颜色控制")
+    private String color;
+
+    @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 

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

@@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单条码信息
@@ -167,6 +171,11 @@ public class WmsMoveSnSnapshot extends SnapshotBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "LEFT_CODE")
+    @ApiParam(value = "生产批次")
+    private String leftCode;
+
+
     @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1373,6 +1373,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {