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

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

@@ -184,6 +184,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("队列类型")
     private Integer queueType;
 
+    @Transient
+    @ApiParam("等级名称")
+    private String gradeName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

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

@@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable {
     @ApiParam("工步对象")
     private String stepObject;
 
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     /**
      * 工位扫描业务所需使用字段
      */

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

@@ -82,11 +82,15 @@ public class StepModel implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
     public StepModel() {
     }
 
     public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
-                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName,
+                     String workCellCode, Integer triggerType) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -98,5 +102,6 @@ public class StepModel implements Serializable {
         this.paramCode = paramCode;
         this.stepDisplayName = stepDisplayName;
         this.workCellCode = workCellCode;
+        this.triggerType = triggerType;
     }
 }

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

@@ -122,5 +122,7 @@ public class StepPrintSnModel extends MesProduceSn {
     private String shiftName;
     @ApiParam("JIT排序号")
     private String jitSeq;
+    @ApiParam("产品位置名称")
+    private String produceCategoryName;
 
 }

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

@@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
-    @ApiParam("状态")
+    @ApiParam("明细状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
-    private Integer itemStatus;
+    private String itemStatus;
 
     @Transient
     @ApiParam("erp库存地")
@@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean {
     private String srcZoneNo;
 
     @Transient
-    @ApiParam("处理数量")
+    @ApiParam("需求数量")
     private Double transQty;
 
     @Transient
+    @ApiParam("处理数量")
+    private Double handledQty;
+
+    @Transient
     @ApiParam("不合格处理数量")
     private Double rejectQty;
 
@@ -197,7 +201,7 @@ public class WmsMoveMaster extends BaseBean {
         this.errorMessage = errorMessage;
         this.busiTypeCode = busiTypeCode;
         this.partNo = partNo;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.refOrderNo = refOrderNo;
         this.carNo = carNo;
         this.refSrc = refSrc;
@@ -220,7 +224,7 @@ public class WmsMoveMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
@@ -237,22 +241,25 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
+    public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode,
-                         String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
+                         String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo,
-                         String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) {
+                         String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty,
+                         String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser,
+                         String modifyDatetime, String refSrc) {
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;
         this.destWhNo = destWhNo;
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
+        this.handledQty = handledQty;
         this.rejectQty = rejectQty;
         this.fixId = fixId;
         this.busiTypeCode = busiTypeCode;
@@ -272,7 +279,7 @@ public class WmsMoveMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
-        this.itemStatus = itemStatus;
+        this.itemStatus = itemStatus.toString();
         this.unit = unit;
         this.srcWhNo = srcWhNo;
         this.srcZoneNo = srcZoneNo;