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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -229,6 +229,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("维修状态")
     private Integer repairStatus;
 
+    @Transient
+    @ApiParam("颜色名称")
+    private String colorName;
+
     public MesProduceSn() {
     }
 

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

@@ -3519,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/WmsDocMovementDetails.java

@@ -107,6 +107,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "超时时间(单位:分钟)")
     private Integer timeOut;
 
+    @Transient
+    @ApiParam(value = "窗口时间")
+    private Integer windowTime;
+
+    @Transient
+    @ApiParam(value = "紧急程度")
+    private String urgentStatus;
+
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")
     private String srcNo;
@@ -123,6 +131,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "完成状态")
     public Integer orderStatus;
 
+    @Transient
+    @ApiParam(value = "客户名称")
+    public String custName;
+
+    @Transient
+    @ApiParam(value = "道口")
+    public String dock;
+
     /**
      * 已创建，已收货，已发运，已拣货
      */
@@ -134,6 +150,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
+    @Transient
+    @ApiParam(value = "完成数百分比")
+    private String number;
+
     /**
      * 是否免费:0=计费,1=免费
      */
@@ -285,6 +305,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("生产日期")
     public String dateCode;
 
+    @Transient
+    @ApiParam("生产线")
+    public String line;
+
     @ApiParam(value = "散件移库输入移库数量")
     @Transient
     public Double inputMoveQty;
@@ -420,8 +444,27 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("窗口领料结束时间")
     private String windowPickEndTime;
 
-    public WmsDocMovementDetails () {
+    public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty,
+    Double recQty,Double outQty,Integer itemStatus) {
+        this.custNo = custNo;
+        this.orderNo = orderNo;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.recQty= recQty;
+        this.outQty = outQty;
+        this.itemStatus = itemStatus;
+        this.projectNo = projectNo;
+        this.partNo=partNo;
+    }
 
+    public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) {
+        this.createDatetime = createDatetime;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.createUser = createUser;
+        this.itemStatus= itemStatus;
     }
 
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
@@ -485,6 +528,11 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.custNo = custNo;
     }
 
+    public WmsDocMovementDetails(){
+
+    }
+
+
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) {
         this.orderNo = orderNo;
         this.srcZoneNo = srcZoneNo;

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

@@ -412,9 +412,10 @@ public class WmsMoveSn extends BaseBean {
     }
 
 
-    public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) {
+    public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) {
         this.sn = sn;
         this.refSrc = refSrc;
+        this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
         this.itemStatus = itemStatus;
     }