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/MesEnumUtil.java

@@ -5347,7 +5347,9 @@ public class MesEnumUtil {
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
         BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
         BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"),
-        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板");
+        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"),
+        BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"),
+        BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板");
 
         private String code;
         private String description;

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

@@ -355,7 +355,8 @@ public class MesPcnEnumUtil {
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
         PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
+        SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
 
         private int value;
         private String code;

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

@@ -47,10 +47,22 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("反喷标识")
     private String reverseSprayMark;
 
+    @ApiParam("班次")
+    private String shiftName;
+
+    @ApiParam("车间配置代码")
+    private String areaConfigCode;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;
 
     @ApiParam("列值")
     private List<List<Double>> headValueModelList;
 
+    @ApiParam("不良汇总列名")
+    private List<String> defectNameList;
+
+    @ApiParam("不良汇总列值")
+    private List<Double> defectValueList;
+
 }

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

@@ -729,6 +729,24 @@ public class MesHqlPack {
     }
 
     /**
+     * 产线看板矩阵
+     * @param boardLineMatrix
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode);
+        if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工步参数信息查询条件封装
      *
      * @param stepParam
@@ -3501,4 +3519,25 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES下线报工查询条件封装
+     *
+     * @param productOffLine
+     * @return
+     */
+    public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode());
+        if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(productOffLine.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }

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

@@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean {
         this.modifyUser = modifyUser;
     }
 
+    public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
+                     String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
+                     Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,
+                     String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.item = item;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.srcQty = srcQty;
+        this.srcQty = srcQty;
+        this.destQty = destQty;
+        this.srcQcStatus = srcQcStatus;
+        this.descQcStatus = descQcStatus;
+        this.srcSnStatus = srcSnStatus;
+        this.destSnStatus = destSnStatus;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.refSrc = refSrc;
+        this.destZoneNo = destZoneNo;
+        this.destWhNo = destWhNo;
+        this.busiTypeCode = busiTypeCode;
+        this.sn = sn;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+    }
+
     public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) {
         this.id = id;
         this.organizeCode = organizeCode;