dev合并test test有修改

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

@@ -3915,6 +3915,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static PRINT_TYPE codeOf(int value) {
+            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/MesPackage.java

@@ -26,7 +26,7 @@ import java.io.Serializable;
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
 })
-@Api("包装规格")
+@Api("包装表")
 public class MesPackage extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5275923991324889995L;
 

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

@@ -18,8 +18,16 @@ public class CellFeedModel {
 
     private String partNo;
 
+    private String partName;
+
     private String itemPartNo;
 
-    private String qty;
+    private String itemPartName;
+
+    private String shouldQty;
+
+    private String remainQty;
+
+    private String scanQty;
 
 }

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesTooling;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : MES_设备工装关系Model
+ * @Reference :
+ * @Author :qianhuasheng
+ * @CreateDate : 2020-04-02 16:34
+ * @Modify:
+ **/
+@Data
+@Api("MES_设备工装关系Model")
+public class MesEquipmentToolingModel implements Serializable {
+
+    private static final long serialVersionUID = 1947971352179107711L;
+
+    private Long id;
+
+    @ApiParam("显示颜色")
+    private String color;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @ApiParam("更换开始时间")
+    private String startTime;
+
+    @ApiParam("更换结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("最大次数")
+    private Integer useCountMax;
+
+    public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) {
+        this.toolingCode = tooling.getToolingCode();
+        this.toolingName = tooling.getToolingName();
+        this.useCount = useCount;
+        this.useCountMax = tooling.getUseCountMax();
+    }
+    public MesEquipmentToolingModel() {
+    }
+}

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

@@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("队列编号")
     private String orderNo;
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
 
     public QueueOrderModel() {
     }
@@ -90,7 +92,7 @@ public class QueueOrderModel implements Serializable {
     }
 
     public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -102,8 +104,8 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.snStatus = snStatus;
         this.workType = workType;
-        this.finsihQty=finsihQty;
+        this.finsihQty = finsihQty;
-        this.qty=qty;
+        this.qty = qty;
     }
 
     public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -120,8 +122,9 @@ public class QueueOrderModel implements Serializable {
         this.snStatus = snStatus;
         this.workType = workType;
     }
-    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+
-                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -133,12 +136,12 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.snStatus = snStatus;
         this.workType = workType;
-        this.finsihQty=finsihQty;
+        this.finsihQty = finsihQty;
-        this.qty=qty;
+        this.qty = qty;
-        this.orderNo=orderNo;
+        this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -151,18 +154,38 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.snStatus = snStatus;
         this.workType = workType;
-        this.orderNo=orderNo;
+        this.orderNo = orderNo;
     }
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
+
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
+        this.isGroupPrinted = isGroupPrinted;
+    }
+
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
     }
-    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+
-                            String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) {
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) {
+        this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -172,12 +195,12 @@ public class QueueOrderModel implements Serializable {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workType = workType;
-        this.finsihQty=finsihQty;
+        this.finsihQty = finsihQty;
-        this.qty=qty;
+        this.qty = qty;
-        this.orderNo=orderNo;
+        this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -188,6 +211,19 @@ public class QueueOrderModel implements Serializable {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.workType = workType;
-        this.orderNo=orderNo;
+        this.orderNo = orderNo;
+        this.serialNumber=serialNumber;
+    }
+    //料架分组队列展示组件
+    public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
+                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.orderNo = orderNo;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.organizeCode = organizeCode;
     }
 }

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

@@ -120,6 +120,11 @@ public class StationRequestBean implements Serializable {
     @ApiParam("当前流程状态")
     private MesStateMachineStatus curFsmState;
 
+    @ApiParam("展示组件")
+    private Object moduleService;
+
+    @ApiParam("工步序号")
+    private  Integer stepSeq;
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "集装箱号")
     private String containerNo;
 
+    @Transient
+    @ApiParam(value = "箱数")
+    private Integer boxQty;
+
     public WmsStockSn() {
     }
 

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

@@ -44,7 +44,7 @@ public class WmsTransportRule extends BaseBean {
 
     @Column(name = "BUSI_SCENE_TYPE")
     @ApiParam("业务场景")
-    //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
     public Integer busiSceneType;
 

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

@@ -2590,7 +2590,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result);
         DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
-        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
+//        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
 
         getStringBuilderPack(wmsPrintingQueue, result);