合并test分支代码到dev分支

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

@@ -2522,7 +2522,8 @@ public class MesPcnEnumUtil {
         RUNNING_INFO("runningInfo", "执行信息"),
         STOP_PCS_CTL("stopPcsCtl", "停止监控"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
-        PROCESS_CONTENT("processContent", "过程组件内容");
+        PROCESS_CONTENT("processContent", "过程组件内容"),
+        TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容");
 
         private String value;
         private String description;

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

@@ -700,4 +700,44 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条码类型 10=实物条码，20=虚拟条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_STOCK_TYPE {
+        SOURCE(10, "实物条码"),
+        TARGET(20, "虚拟条码"),
+        CUST_SN(30, "客户条码");
+
+        private int value;
+        private String description;
+
+        ORDER_STOCK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -65,11 +65,33 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "erp单号")
     public String erpSrcNo;
 
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
                             String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
+                            String createDatetime, String srcZoneNo, String createUser, String organizeCode) {
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.opTypeName = opTypeName;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+        this.busiTypeCode = busiTypeCode;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.createDatetime = createDatetime;
+        this.srcZoneNo = srcZoneNo;
+        this.createUser = createUser;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
+                            String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo,
                             String createDatetime, String srcZoneNo, String createUser) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -179,6 +179,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }

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

@@ -121,6 +121,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @Transient
     @ApiParam(value = "状态中文")
     private String itemStatusStr;
+
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
     /**
      * 是否免费:0=计费,1=免费
      */
@@ -133,6 +138,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "操作原因")
     private String remark;
 
+    /**
+     * 配料数量
+     **/
     @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "已拣货数量", example = "1")

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

@@ -247,6 +247,9 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号组")
     public String[] partNos;
 
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
 
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;

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

@@ -41,6 +41,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SERIAL_SN")
     @ApiParam("产品条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String serialSn;
 
     @Column(name="BH_TYPE")
@@ -65,15 +66,17 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name="SRC_STOCK_SN")
     @ApiParam("源库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String srcStockSn;
 
     @Column(name="DEST_STOCK_SN")
     @ApiParam("目标库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String destStockSn;
 
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transType;
 

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

@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -104,6 +108,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @Transient
+    @ApiParam("工厂集合")
+    private List<String> organizeCodeList;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -18,26 +20,38 @@ public class WmsMoveInfoModel {
 
     @ApiParam(value = "操作时间")
     private String modifyDateTime;
+
     @ApiParam(value = "物料号")
     private String partNo;
+
     @ApiParam(value = "物料名称")
     private String partNameRdd;
+
     @ApiParam(value = "交易类型")
     private String transTypeCode;
+
     @ApiParam(value = "交易类型名称")
     private String transTypeName;
+
     @ApiParam(value = "业务类型")
-    private String busiTypeCode;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer busiTypeCode;
+
     @ApiParam(value = "处理数量")
     private String sumQty;
+
     @ApiParam(value = "工厂代码")
     private String organizeCode;
+
+
     @ApiParam(value = "操作状态")
-    private String itemStatus;
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
     public WmsMoveInfoModel() {
     }
 
-    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) {
+    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) {
         this.modifyDateTime = modifyDateTime;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -224,7 +224,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
-
+        DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean);
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
         return packBean;

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./