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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java

@@ -43,4 +43,6 @@ public @interface DynamicField {
     String searchColumnName() default "";
     // 回显列名
     String explicitColumnName() default "";
+    // 下拉框规则
+    WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
 }

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

@@ -1239,7 +1239,9 @@ public class MesEnumUtil {
     public enum MES_PRODUCE_SN_TYPE {
 
         NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
+        FIRST_INSPECTION(20, "首检件"),
+        HALF_PRODUCT(30, "半成品"),
+        KP(40, "关键件");
 
         private int value;
         private String description;

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

@@ -418,7 +418,9 @@ public class MesPcnEnumUtil {
     public enum MES_PRODUCE_SN_TYPE {
 
         NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
+        FIRST_INSPECTION(20, "首检件"),
+        HALF_PRODUCT(30, "半成品"),
+        KP(40, "关键件");
 
         private int value;
         private String description;
@@ -2215,43 +2217,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 条码类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PCN_SN_TYPE {
-
-        NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
-
-        private int value;
-        private String description;
-
-        PCN_SN_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-
-    /**
      * MesPlanOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -139,6 +139,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
 
@@ -1266,45 +1275,45 @@ public class WmsEnumUtil {
         }
     }
 
-	/**
+    /**
-	 * 盘点主表 单据类型
+     * 盘点主表 单据类型
-	 */
+     */
-	@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-	public enum CS_STRATEGY_TYPE {
+    public enum CS_STRATEGY_TYPE {
-		PART_COVERAGE(110, "物料分类覆盖"),
+        PART_COVERAGE(110, "物料分类覆盖"),
-		TOUCH(120, "动碰"),
+        TOUCH(120, "动碰"),
-		ZORE_STOCK(130, "零库存");
+        ZORE_STOCK(130, "零库存");
-
+
-		private int value;
+        private int value;
-		private String description;
+        private String description;
-
+
-		CS_STRATEGY_TYPE(int value, String description) {
+        CS_STRATEGY_TYPE(int value, String description) {
-			this.value = value;
+            this.value = value;
-			this.description = description;
+            this.description = description;
-		}
+        }
-
+
-		public int getValue() {
+        public int getValue() {
-			return value;
+            return value;
-		}
+        }
-
+
-		public String getDescription() {
+        public String getDescription() {
-			return description;
+            return description;
-		}
+        }
-
+
-		public static String valueOf(int val) {
+        public static String valueOf(int val) {
-			String tmp = null;
+            String tmp = null;
-			for (int i = 0; i < values().length; i++) {
+            for (int i = 0; i < values().length; i++) {
-				if (values()[i].value == val) {
+                if (values()[i].value == val) {
-					tmp = values()[i].description;
+                    tmp = values()[i].description;
-				}
+                }
-			}
+            }
-			return tmp;
+            return tmp;
-		}
+        }
-
+
-		public static String valueOfDescription(int val) {
+        public static String valueOfDescription(int val) {
-			return valueOf(val);
+            return valueOf(val);
-		}
+        }
-	}
+    }
 
     /**
      * 盘点主表 单据类型
@@ -2977,6 +2986,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
@@ -4169,7 +4187,7 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
+    /**分类
      * 物流规则 处理单位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4406,10 +4424,10 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PACKAGE_OPERATE_TYPE {
-        PACKAGE_ADD("PACKAGE_ADD", "新增"),
+        PACKAGE_ADD("PACKAGE_ADD", "新建组号"),
-        PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"),
+        PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "增添条码"),
-        PACKAGE_DELETE("PACKAGE_DELETE", "删除"),
+        PACKAGE_DELETE("PACKAGE_DELETE", "移除条码"),
-        PACKAGE_CLEAR("PACKAGE_CLEAR", "清空");
+        PACKAGE_CLEAR("PACKAGE_CLEAR", "删除组号");
 
         private String value;
         private String description;
@@ -4890,10 +4908,18 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+        public static FIELD_TYPE codeOf(Integer value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value==value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
-     * 推送类型
+     * 推送类型单位
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5212,4 +5238,67 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 动态查询-下拉框规则
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_FIELD_SELECT_RULE {
+        SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"),
+        MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"),
+        SINGLE_URL(30, "SINGLE_URL", "单选接口"),
+        MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static DYNAMIC_FIELD_SELECT_RULE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -55,9 +55,9 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("数据下限")
     private Double lowerLimit;
 
-    @Column(name = "TERMINAL_ID")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工位")
-    private Integer terminalId;
+    private String workCellCode;
 
     @Column(name = "TORQUE_GROUP")
     @ApiParam("扭矩组")
@@ -79,6 +79,10 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("JOB_ID")
     private Integer jobId;
 
+    @Column(name = "LAST_TIGHTENING_ID")
+    @ApiParam("最后一次扭矩id")
+    private Long lastTighteningId;
+
     @Transient
     @ApiParam("扭矩值")
     private Double torqueValue;

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

@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_ROUTE_STATUS")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态")
+public class MesRouteStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4988786372428896721L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name = "NEXT_STATUS")
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @Column(name = "TRIGGER_EVENT")
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @Column(name = "TRIGGER_WHERE")
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @Column(name = "ACTION_AMG_ID")
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @Column(name = "IN_AMG_ID")
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @Column(name = "OUT_AMG_ID")
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @Column(name = "STATUS_TYPE")
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+
+}

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -98,6 +100,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("数据map")
     private Map<String, Object> dataMap;
 
+    @ApiParam("流程状态集合")
+    private List<MesRouteStatus> routeStatusList;
+
+    @ApiParam("当前流程状态")
+    private MesRouteStatus curRouteStatus;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 /**
  * @Description: 打印条码工步， 打印信息模板
  * @Reference:
@@ -18,6 +20,9 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("打印描述")
     private String printDesc;
 
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
     @ApiParam("条码")
     private String barCode;
 

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

@@ -31,4 +31,7 @@ public class WmsListSearchModel {
 
     @ApiParam(value = "有效性")
     public Integer isValid;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
 }

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

@@ -104,6 +104,10 @@ public class WmsCSOrderMaster extends BaseBean {
     public String wmsCSZonesStr;
 
     @Transient
+    @ApiParam(value = "盘点库存地清单")
+    public String wmsAreaNosStr;
+
+    @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
@@ -117,4 +121,5 @@ public class WmsCSOrderMaster extends BaseBean {
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }
+
 }

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

@@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class)
     private String partType;
 
     @Column(name = "PART_TYPE_DESC")
@@ -75,7 +75,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "STOCK_UNIT")
     @ApiParam(value = "库存单位")
-    @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/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
     private String stockUnit;
 
     @Column(name = "ABC")
@@ -85,7 +86,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "BUY_UNIT")
     @ApiParam(value = "采购单位")
-    @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/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
     private String buyUnit;
 
     @Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@@ -95,7 +97,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PRICE_UNIT")
     @ApiParam(value = "计价单位")
-    @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/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
     private String priceUnit;
 
     @Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@@ -126,12 +129,14 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_GROUP")
     @ApiParam(value = "物料组")
-    @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/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String partGroup;
 
     @Column(name = "LOT_CHECK_RULE")
     @ApiParam(value = "批次校验规则")
-    @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/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String lotCheckRule;
 
     @Column(name = "SN_CONTROL")
@@ -146,8 +151,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String inLocateNo;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
@@ -197,7 +202,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PRODUCT_LINES")
     @ApiParam("报工产线")
-    @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/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
     private String productLines;
 
     @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
@@ -222,7 +228,7 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String stockLevelStatus;
 
-    @Column(name="verb_num")
+    @Column(name = "verb_num")
     @ApiParam(value = "单次拆包数")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double verbNum;
@@ -233,9 +239,10 @@ public class WmsPart extends BaseBean {
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM,
-    @ApiParam(value = "拉动方式", example = "0")
+            isRequire = 2, entityName = "PULL_WAY_STATUS")
-    private Integer pullWay = 0;
+    @ApiParam(value = "拉动方式")
+    private String pullWay;
 
     @Column(name = "CYCLE_RQUEST_PERIOD")
     @ApiParam(value = "循环补货周期", example = "0")
@@ -252,11 +259,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double curingTime = 0d;
 
-    public int getIqcVal(){
+    public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 
-    public int getCycleRquestPeriod(){
+    public int getCycleRquestPeriod() {
         return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
     }
 
@@ -264,23 +271,23 @@ public class WmsPart extends BaseBean {
     }
 
     public Double getQty() {
-        return qty == null? 0:qty;
+        return qty == null ? 0 : qty;
     }
 
     public Double getMin() {
-        return min == null? 0: min;
+        return min == null ? 0 : min;
     }
 
     public Double getMax() {
-        return max == null? 0:max;
+        return max == null ? 0 : max;
     }
 
     public Double getCycleRquestQty() {
-        return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
+        return this.cycleRquestQty == null ? 0d : this.cycleRquestQty.doubleValue();
     }
 
     public Double getCuringTime() {
-        return this.curingTime == null? 0d:this.curingTime.doubleValue();
+        return this.curingTime == null ? 0d : this.curingTime.doubleValue();
     }
 
 

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

@@ -119,6 +119,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "目的库位")
     private String destMoveType;
 
+    @Column(name = "DEST_MOVE_SN_STATUS")
+    @ApiParam(value = "目的单据条码状态")
+    private Integer destMoveSnStatus;
+
     public WmsRoutingRule(){}
 
 }

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

@@ -43,7 +43,7 @@ public class WmsFieldInfo extends BaseBean {
 
     @Column(name = "FIELD_TYPE")
     @ApiParam(value = "字段类型")
-    private String fieldType;
+    private Integer fieldType;
 
     @Column(name = "ENUM_NAME")
     @ApiParam(value = "字段枚举名称")
@@ -77,6 +77,10 @@ public class WmsFieldInfo extends BaseBean {
     @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
     private Integer isWider;
 
+    @Column(name = "IS_QUERY")
+    @ApiParam(value = "是否可选作查询条件:默认1-可选，2-不可选")
+    private Integer isQuery;
+
     @Column(name = "IS_SELECT")
     @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
     private Integer isSelect;
@@ -104,4 +108,8 @@ public class WmsFieldInfo extends BaseBean {
     @Column(name = "EXPLICIT_COLUMN_NAME")
     @ApiParam(value = "回显列名")
     private String explicitColumnName;
+
+    @Column(name = "DYNAMIC_FIELD_SELECT_RULE")
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
 }

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

@@ -81,4 +81,24 @@ public class WmsListElement extends BaseBean {
     @Column(name = "FUNCTION_ID")
     @ApiParam(value = "功能菜单ID")
     private Long functionId;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam(value = "字段类型")
+    private Integer fieldType;
+
+    @Column(name = "DYNAMIC_FIELD_SELECT_RULE")
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+
+    @Column(name = "ENTITY_NAME")
+    @ApiParam(value = "实体名称")
+    private String entityName;
+
+    @Column(name = "LIST_COLUMN_NAME")
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
 }

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

@@ -43,7 +43,7 @@ public class WmsSearchElement extends BaseBean {
 
     @Column(name = "FIELD_TYPE")
     @ApiParam(value = "字段类型")
-    private String fieldType;
+    private Integer fieldType;
 
     @Column(name = "CONDITION_EXPRE")
     @ApiParam(value = "条件表达式:>,<,>=等")

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

@@ -14,8 +14,6 @@ import lombok.Data;
 @Api("未完成订单模型")
 public class WmsMoveUnfinishedOrderModel extends  BaseBean{
 
-
-
     @ApiParam("物料编码")
     private String partNo;
 
@@ -26,7 +24,6 @@ public class WmsMoveUnfinishedOrderModel extends  BaseBean{
     private Double destQty;
 
 
-
     @ApiParam("交易类型")
     private String transTypeCode;
 

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=./