Merge branch 'test' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -82,7 +82,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
@@ -94,7 +95,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")

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

@@ -4,6 +4,7 @@ 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;
 
@@ -74,6 +75,10 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("料架是否已打印")
     private Integer isGroupPrinted;
 
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     public QueueOrderModel() {
     }
 
@@ -183,8 +188,9 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
+    //getWaitQueueOrderModelNoSn
     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) {
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -198,8 +204,9 @@ public class QueueOrderModel implements Serializable {
         this.finsihQty = finsihQty;
         this.qty = qty;
         this.orderNo = orderNo;
+        this.pptCode=pptCode;
     }
-
+    //getAlreadyQueueOrderModelNoSn
     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;
@@ -214,6 +221,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
         this.serialNumber=serialNumber;
     }
+
     //料架分组队列展示组件
     public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
                            Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {

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

@@ -177,7 +177,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "OUT_CLOSE_VENDOR")
     @ApiParam("结算供应商")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
+            searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
     private String outCloseVendor;
 
     @Column(name = "QUALITY_DAYS")