diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index ebd53c3..f8fa98e 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4fa7c5a..1414885 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index e97c0bb..d790ef1 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java
index cd04561..9dfac91 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 02f71d3..4fd1ad6 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/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)
- public enum CS_STRATEGY_TYPE {
- PART_COVERAGE(110, "物料分类覆盖"),
- TOUCH(120, "动碰"),
- ZORE_STOCK(130, "零库存");
-
- private int value;
- private String description;
-
- CS_STRATEGY_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);
- }
- }
+ /**
+ * 盘点主表 单据类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum CS_STRATEGY_TYPE {
+ PART_COVERAGE(110, "物料分类覆盖"),
+ TOUCH(120, "动碰"),
+ ZORE_STOCK(130, "零库存");
+
+ private int value;
+ private String description;
+
+ CS_STRATEGY_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);
+ }
+ }
/**
* 盘点主表 单据类型
@@ -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_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"),
- PACKAGE_DELETE("PACKAGE_DELETE", "删除"),
- PACKAGE_CLEAR("PACKAGE_CLEAR", "清空");
+ PACKAGE_ADD("PACKAGE_ADD", "新建组号"),
+ PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "增添条码"),
+ PACKAGE_DELETE("PACKAGE_DELETE", "移除条码"),
+ 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;
+ }
+ }
}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 90e744d..c6141da 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 0ba3645..23e5bee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 6706323..c1e2cb9 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index ffcac19..856da5f 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index e388a1d..09f2c4a 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 62ebe64..82fdbe8 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 39d9423..b7b2dfc 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
index 43e219f..88d4883 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index e310bfd..ec9e100 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 92de049..0db7b7d 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index e36fcf7..bd09726 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 81fb02b..4c96781 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 1f622d9..2c24e41 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index bc41914..18c811c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
index 6d70ddc..c632d9f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/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();
}
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 378144b..85ec609 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/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",
- searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+ @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+ 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")
- @ApiParam(value = "拉动方式", example = "0")
- private Integer pullWay = 0;
+ @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM,
+ isRequire = 2, entityName = "PULL_WAY_STATUS")
+ @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();
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
index b2119ad..892ea6e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/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(){}
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
index 0321169..01b511f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java
index 41f6b6f..1359939 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
index 99b223f..7a9cbbb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
+++ b/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 = "条件表达式:>,<,>=等")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java
index f87e945..dd2b411 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java
+++ b/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;
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 93f9732..1171f4e 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 2ffb2ae..bca9cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
diff --git a/sonar-project.properties b/sonar-project.properties
index 55e4e84..932bdd9 100644
--- a/sonar-project.properties
+++ b/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=./