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

@@ -244,18 +244,13 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
         this.qty = qty;
     }
-//sn.serialNumber, sn.productSn, " +
-//                " sn.partNo, sn.partNameRdd, sn.qty, sn.qcStatus, sn.snStatus, sn.printCount, sn.printStatus" +
-//                " sn.workCenterCode, sn.workCellCode, sn.routeCode, sn.processCode, sn.nextProcessCode, sn.inWorkCenterTime, " +
-//                " sn.outWorkCenterTime, sn.shippingTime, sn.workOrderNo, sn.custSn, sn.custPartNo, sn.custCode," +
-//                " sn.snType, sn.trayNo, sn.operateType, sn.processLabelTemplate, sn.prodLabelTemplate, sn.custLabelTemplate, " +
-//                " sn.lotNo, sn.defectActionType, sn.vinCode, p.versionNo
+
     public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
                         Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
                         String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,
                         String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType,
                         String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo,
-                        String defectActionType, String vinCode, String versionNo) {
+                        String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) {
         this.id = id;
         this.serialNumber = serialNumber;
         this.productSn = productSn;
@@ -288,6 +283,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.defectActionType = defectActionType;
         this.vinCode = vinCode;
         this.versionNo = versionNo;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
     }
 
     public double getQtyVal() {

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java

@@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable {
     public List<WmsOptionModel> options;
     @ApiParam("作业流程明细Model集合")
     public Map<String, WmsAgdCacheModel> wmsAgdCacheModelMap;
+    @ApiParam("流程级别组件参数集合")
+    public Map<String,Map<String,String>> wmsAgAmParamsMap;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 北京麦格纳BBAC库存扣减MODEL
@@ -35,6 +34,9 @@ public class WmsBjmgnBbacReductModel implements Serializable {
     public Double qty;
     @ApiParam("单位")
     public String unit;
+    @ApiParam("包含0")
+    public Integer includeZero;
+
 
     public WmsBjmgnBbacReductModel() {
     }

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

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 作业流程
@@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean {
     @Transient
     @ApiParam(value = "提交步骤序号")
     private Integer submitStepSeq;
+    @Transient
+    @ApiParam(value = "流程级别组件参数")
+    private List<WmsActionStepCallParam> agAmParamsList;
 
     public long getInitAmIdVal() {
         return this.initAmId == null ? 0 : this.initAmId.longValue();