diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 2fdc2ab..9098f50 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -36,7 +36,7 @@ public abstract class BaseBean implements Serializable {
@Id
@GeneratedValue(generator = "IDGenerator")
@GenericGenerator(name = "IDGenerator", strategy = "assigned")
- @Column(name="id")
+ @Column(name="ID")
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@@ -65,34 +65,34 @@ public abstract class BaseBean implements Serializable {
@AnnoOutputColumn(hidden = true)
public String organizeCode;
- @Column(name="is_valid")
+ @Column(name="IS_VALID")
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(hidden = true)
//启用停用
public Integer isValid; //CommonEnumUtil.IS_VAILD;
- @Column(name="is_deleted")
+ @Column(name="IS_DELETED")
@ApiParam(value = "是否已删除",example = "2")
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSE
- @Column(name="create_user",updatable = false)
+ @Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")
@AnnoOutputColumn(hidden = true)
public String createUser;
- @Column(name="create_date",updatable = false)
+ @Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@AnnoOutputColumn(hidden = true)
public String createDatetime;
- @Column(name="modify_user")
+ @Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
public String modifyUser;
- @Column(name="modify_date")
+ @Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@AnnoOutputColumn(hidden = true)
public String modifyDatetime;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java
index cb05869..5da8fca 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java
@@ -13,7 +13,9 @@ import org.springframework.cglib.beans.BeanMap;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
/**
* @Description : 动态转换对象，用于配合dynamicEntity进行动态属性添加
@@ -83,6 +85,13 @@ public class DynamicBean {
if(null != superclass) {
generator.setSuperclass(superclass);
}
+
+ /*Set keySet = propertyMap.keySet();
+ for (Iterator i = keySet.iterator(); i.hasNext(); ) {
+ String key = (String) i.next();
+ generator.addProperty(key, (Class) propertyMap.get(key));
+ }*/
+
BeanGenerator.addProperties(generator, propertyMap);
return generator.create();
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
index f9437db..0231497 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
@@ -160,9 +160,9 @@ public class DynamicEntity extends BaseBean implements Serializable {
} else if (f.getType() == Double.class) {
fieldVal = 0.0d;
} else if (f.getType() == String.class) {
- fieldVal = "";
+ fieldVal = "1";
}else if (f.getType() == Character.class) {
- fieldVal = "";
+ fieldVal = "1";
}else if (f.getType() == Boolean.class) {
fieldVal = true;
}else if (f.getType() == Byte.class) {
@@ -170,7 +170,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
}else if (f.getType() == Date.class) {
fieldVal = new Date();
}else {
- fieldVal = "";
+ fieldVal = "1";
}
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index 6cef54a..1d698a4 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -959,6 +959,16 @@ public class BlockFormEnumUtil {
return tmp;
}
+ public static int codeOfClzFullName(Class clzFullName) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].clzFullName.equals(clzFullName)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
public static int codeOfClassPath(String classPath) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index ed2f951..104f18e 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -302,7 +302,7 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_STATUS {
-// NORMAL(1, "fa fa-success cell-fa fa-check", "正常"),
+// EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
// FREEZE(2, "冻结", "冻结_FREEZE"),
// ABERRANT(3, "异常", "异常_ABERRANT"),
// RESIGNATION(4, "离职", "离职_RESIGNATION"),
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 9ac8347..f97d508 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
@@ -11,54 +11,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
public class WmsEnumUtil {
- /**
- * 拆分规则
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum SPLIT_OR_MERGE_RULE {
- WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料");
- private int value;
- private String code;
- private String description;
-
- SPLIT_OR_MERGE_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 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;
- }
- }
/**
* 订单明细信息 是否免费
@@ -127,57 +79,7 @@ public class WmsEnumUtil {
}
}
- /**
- * 订单明细信息 状态
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum ORDER_DETAILS_STATUS {
- NORMAL(10, "N", "正常"),
- RECEIPTED(20, "R", "已完成"),
- ANCEL(30, "C", "行取消");
-
- private int value;
- private String code;
- private String description;
- ORDER_DETAILS_STATUS(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 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;
- }
- }
/**
* 主表信息 单据类型
@@ -232,14 +134,15 @@ public class WmsEnumUtil {
}
}
+
/**
- * 移库单主表状态；质检单主表状态
+ * 单据主表状态(ASN,PO,MOVE,QC)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MASTER_ORDER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "处理中"),
- RECEIPT_FINISH(30, "已完成"),
+ RECEIPT_FINISH(30, "已处理"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
@@ -281,21 +184,22 @@ public class WmsEnumUtil {
}
/**
- * 收货主表信息 状态
+ * 订单明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum RC_ORDER_STATUS {
- CREATE(10, "新建"),
- RECEIPT(20, "收货中"),
- RECEIPT_FINISH(30, "收货完成"),
- CLOSED(40, "已关闭"),
- CANCELLED(50, "已取消");
+ public enum ORDER_DETAILS_STATUS {
+ CREATE(10, "N", "创建"),
+ RECEIPTED(20, "R", "已完成"),
+ CANCEL(30, "C", "行取消"),
+ PRINTED(40, "C", "已打印");
private int value;
+ private String code;
private String description;
- RC_ORDER_STATUS(int value, String description) {
+ ORDER_DETAILS_STATUS(int value, String code, String description) {
this.value = value;
+ this.code = code;
this.description = description;
}
@@ -307,6 +211,10 @@ public class WmsEnumUtil {
return description;
}
+ public String getCode() {
+ return code;
+ }
+
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@@ -329,19 +237,22 @@ public class WmsEnumUtil {
}
/**
- * PO条码状态信息
+ * PO条码状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum SN_DETAILS_STATUS {
- CREATE(10, "新建"),
- WAREHOUSING(30, "已打印"),
- RECEIPT_FINISH(20, "已收货");
+ public enum PO_SN_STATUS {
+ CREATE(10, "N", "创建"),
+ RECEIPTED(20, "R", "已完成"),
+ CANCEL(30, "C", "行取消"),
+ PRINTED(40, "C", "已打印");
private int value;
+ private String code;
private String description;
- SN_DETAILS_STATUS(int value, String description) {
+ PO_SN_STATUS(int value, String code, String description) {
this.value = value;
+ this.code = code;
this.description = description;
}
@@ -353,6 +264,10 @@ public class WmsEnumUtil {
return description;
}
+ public String getCode() {
+ return code;
+ }
+
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@@ -374,9 +289,8 @@ public class WmsEnumUtil {
}
}
-
/**
- * 产品入库的产品状态
+ * 产品入库，发运状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS {
@@ -471,7 +385,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOCATE_STATUS {
- CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
+ EMPTY(10, "空库位"), NOT_EMPTY(20, "非空"), FULL(30, "已满");
private int value;
private String description;
@@ -501,7 +415,7 @@ public class WmsEnumUtil {
}
/**
- * 外部单据：移库单移动类型
+ * 移库单移动类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MOVE_TYPE {
@@ -666,54 +580,10 @@ public class WmsEnumUtil {
}
/**
- * 外部单据：移库单单据类型
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
- ORDER_PULL_PART(1, "工单配料");
-
- private int value;
- private String description;
-
- OUT_MOVEMENT_MASTER_ORDER_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 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;
- }
- }
-
- /**
- * 外部单据：移库单关联单据类型
+ * 外部单据：关联单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
+ public enum LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"),
SO(30, "SO", "SO"),
@@ -726,7 +596,7 @@ public class WmsEnumUtil {
private String code;
private String description;
- OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) {
+ LINK_ORDER_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@@ -764,7 +634,7 @@ public class WmsEnumUtil {
return tmp;
}
- public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) {
+ public static LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
@@ -843,45 +713,6 @@ public class WmsEnumUtil {
}
}
- /**
- * ASN单据状态 10=新建,20=收货中,30=收货完成，40=已关闭,50=已取消
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum ASN_STATUS {
-
- CREATE(10, "新建"),
- RECEIPT(20, "收货中"),
- RECEIPT_FINISH(30, "收货完成"),
- CLOSED(40, "已关闭"),
- CANCELLED(50, "已取消");
-
- private int value;
- private String description;
-
- ASN_STATUS(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;
- }
- }
-
/**
* 业务表：库存条码状态
@@ -889,14 +720,14 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
- CREATE(1, "创建"),
- QUALITY_CONTROL(10, "质检中"),
- PRE_INSTOCK(20, "待入库"),
- INSTOCKED(30, "入库"),
- PICKED(40, "配料"),
- OUT_STOCK(50, "出库"),
- FRAZE(60, "报废"),
- COMMING(70, "在途");
+ CREATE(10,"创建"),
+ QUALITY_CONTROL(20, "质检中"),
+ PRE_INSTOCK(30, "待入库"),
+ INSTOCKED(40, "入库"),
+ PICKED(50, "配料"),
+ OUT_STOCK(60, "出库"),
+ FRAZE(70, "报废"),
+ COMMING(80, "在途");
private int value;
private String description;
@@ -940,7 +771,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
- NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+ NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
private int value;
private String code;
@@ -983,6 +814,7 @@ public class WmsEnumUtil {
}
return tmp;
}
+
public static STOCK_SN_QC_STATUS codeOf(Integer value) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@@ -1113,7 +945,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS {
- CREATE(1, "创建"), FINISH(10, "已处理");
+ CREATE(10, "创建"), FINISH(20, "已处理");
private int value;
private String description;
@@ -1256,12 +1088,12 @@ public class WmsEnumUtil {
}
/**
- * 质检明细转态
+ * 质检明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ITEM_STATUS {
- NORMAL(1, "正常"),
- CANCELLATION(10, "行取消");
+ NORMAL(10, "创建"),
+ CANCELLATION(20, "行取消");
private int value;
private String description;
@@ -1543,42 +1375,6 @@ public class WmsEnumUtil {
}
}
- /**
- * PO条码表条码状态
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum PO_SN_STATUS {
-
- FOUND(10, "创建"),
- PRINTED(20, "已打印"),
- RECEIPTED(30, "已收货");
-
- private int value;
- private String description;
-
- PO_SN_STATUS(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;
- }
- }
/**
* 组件类型
@@ -1961,17 +1757,17 @@ public class WmsEnumUtil {
private String description;
private String code;
- DATA_STATUS(int value, String code, String description){
+ DATA_STATUS(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
- public int getValue () {
+ public int getValue() {
return value;
}
- public String getDescription () {
+ public String getDescription() {
return description;
}
@@ -1979,7 +1775,7 @@ public class WmsEnumUtil {
return code;
}
- public static String valueOf (int val){
+ public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@@ -2003,17 +1799,17 @@ public class WmsEnumUtil {
private String code;
private String description;
- PRINT_TEMPLATE(int value, String code, String description){
+ PRINT_TEMPLATE(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
- public int getValue () {
+ public int getValue() {
return value;
}
- public String getDescription () {
+ public String getDescription() {
return description;
}
@@ -2021,7 +1817,7 @@ public class WmsEnumUtil {
return code;
}
- public static String valueOf (int val){
+ public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@@ -2043,17 +1839,17 @@ public class WmsEnumUtil {
private String code;
private String description;
- VERSION(int value, String code, String description){
+ VERSION(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
- public int getValue () {
+ public int getValue() {
return value;
}
- public String getDescription () {
+ public String getDescription() {
return description;
}
@@ -2061,7 +1857,7 @@ public class WmsEnumUtil {
return code;
}
- public static String valueOf (int val){
+ public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@@ -2077,16 +1873,16 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_TYPE {
- BOX(10 , "BOX", "BOX（盒）"),
- CARTON(20 , "CARTON", "CARTON（箱）"),
- PALLET(30 , "PALLET", "PALLET（栈板）"),
- CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+ BOX(10, "BOX", "BOX（盒）"),
+ CARTON(20, "CARTON", "CARTON（箱）"),
+ PALLET(30, "PALLET", "PALLET（栈板）"),
+ CONTAINER(40, "PALLET", "PALLET（集装箱）");
private String code;
private String description;
int value;
- PACKAGE_TYPE(int value , String code, String description) {
+ PACKAGE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
index 4953b67..6648ee4 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
@@ -36,7 +36,7 @@ public class BfDataObject extends BaseBean {
private String objectName;
@Column(name="OBJECT_CLASS_NAME")
- @ApiParam(value ="中文名称")
+ @ApiParam(value ="类名称")
private String objectClassName;
@Column(name="OBJECT_TABLE_NAME")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
index 30abaca..8903aea 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
@@ -49,6 +49,13 @@ public class BfLayout extends BaseBean {
@ApiParam(value = "列数")
private Integer layoutColumnCount;
+ public Integer getLayoutColumnCount(){
+ if(this.layoutColumnCount == null) {
+ return null;
+ }
+ return layoutColumnCount.intValue();
+ }
+
@Column(name = "LAYOUT_REPORT_COUNT")
@ApiParam(value = "引用报表数量")
private Integer layoutReportCount;
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index e975c42..d9f2e52 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -31,6 +31,11 @@
i3plus.pojo
+ i3plus-pojo-form
+
+
+
+ i3plus.pojo
i3plus-pojo-wms
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
index ac7da8e..a518608 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
@@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.model.form;
+import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.Objects;
@@ -28,4 +30,5 @@ public class SqlCreateDllModel {
private String refGeneration;
List columnlist ;
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 42905ae..d1aee88 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("单据类型")
public String asnType;
- @Column(name = "ASN_STATUS")
+ @Column(name = "MASTER_ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer asnStatus;
@@ -83,14 +83,6 @@ public class WmsASNMaster extends BaseBean {
private String sendUser;
@Transient
- @ApiParam(value = "收货人")
- private String rcUser;
-
- @Transient
@ApiParam(value = "发货日期")
private String sendDate;
-
- @Transient
- @ApiParam(value = "收货日期")
- private String rcDate;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
index ce33950..ccfdb36 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@@ -100,9 +100,9 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("组条码")
public String groupNo;
- @Column(name = "ERP_WH_NO")
+ @Column(name = "ERP_AREA_NO")
@ApiParam("默认收货库存地")
- public String erpWhNo;
+ public String erpAreaNo;
@Column(name = "VENDOR_LOT_NO")
@ApiParam("供应商批次")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 5d950d3..9186610 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -81,4 +81,11 @@ public class WmsCSFactTrans extends BaseBean {
@Column(name="REMARK")
@ApiParam(value = "备注")
public String reMark;
+
+ public WmsCSFactTrans(){}
+
+ public WmsCSFactTrans(double factQty, String partNo){
+ this.factQty = factQty;
+ this.partNo = partNo;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index 6e72309..1fc9743 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* @Description : 盘点单冻结信息
@@ -94,7 +95,21 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam(value = "处理状态", example = "1")
public Integer transStatus;
+ //虚拟字段（实盘数量、剩余数量）
+ @Transient
+ public Double factQty;
+
+ @Transient
+ public Double surplusQty;
+
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
+
+ public WmsCSOrderDetails(){}
+
+ public WmsCSOrderDetails(double qty, String partNo){
+ this.qty = qty;
+ this.partNo = partNo;
+ }
}
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 05c572c..edbb890 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
@@ -77,4 +77,8 @@ public class WmsCSOrderMaster extends BaseBean {
@Transient
@ApiParam(value = "盘点库位清单")
public String[] wmsCSLocates;
+
+ @Column(name = "IS_PART")
+ @ApiParam(value = "是否散件")
+ private Integer isPart;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index caaad9d..afe6d77 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* @Description :移库单明细实体(用于转储类业务)
@@ -138,4 +139,12 @@ public class WmsDocMovementDetails extends BaseBean {
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
+
+ @Transient
+ @ApiParam("推荐批次")
+ private String recommondLot;
+
+ @Transient
+ @ApiParam("推荐库位")
+ private String recommondLocateNo;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index c462531..816f364 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -120,20 +120,4 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
@ApiParam(value = "打印时间")
private String printDate;
-
- @Transient
- @ApiParam(value = "发货人")
- private String sendUser;
-
- @Transient
- @ApiParam(value = "收货人")
- private String rcUser;
-
- @Transient
- @ApiParam(value = "发货日期")
- private String sendDate;
-
- @Transient
- @ApiParam(value = "收货日期")
- private String rcDate;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
index f720f6a..34e6e8b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
@@ -76,9 +76,9 @@ public class WmsFGInStock extends BaseBean {
@ApiParam("单据来源")
public String src;
- @Column(name="ERP_WH_NO")
+ @Column(name="ERP_AREA_NO")
@ApiParam("默认收货库存地")
- public String erpWhNo;
+ public String erpAreaNo;
@Column(name="LINE_NO")
@ApiParam("生产线")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 5734f05..1d95450 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -101,14 +101,6 @@ public class WmsPOMaster extends BaseBean {
private String sendUser;
@Transient
- @ApiParam(value = "收货人")
- private String rcUser;
-
- @Transient
@ApiParam(value = "发货日期")
private String sendDate;
-
- @Transient
- @ApiParam(value = "收货日期")
- private String rcDate;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index 6377255..e181f09 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -101,7 +101,7 @@ public class WmsPOMasterDetails extends BaseBean {
*/
@Column(name = "ITEM_STATUS")
@ApiParam("状态")
- public String itemStatus;
+ public Integer itemStatus;
@Column(name = "SNP")
@ApiParam("标准包装")
@@ -118,6 +118,10 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam(value = "散件收货输入数量", example = "0")
public Double inputRcQty;
+ @Transient
+ @ApiParam(value = "供应商批次")
+ public String dateCode;
+
public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index a89463d..fd7244e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -165,4 +165,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "二维码内容")
@Transient
public String barCode;
+
+ public WmsStockSn(){}
+
+ public WmsStockSn(String partNo){
+ this.partNo = partNo;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index 0834489..34b8db4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -85,6 +85,13 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "状态", example = "1")
private Integer itemStatus;
+ public Integer getItemStatus(){
+ if(itemStatus == null) {
+ return null;
+ }
+ return itemStatus.intValue();
+ }
+
@Column(name = "SRC_ZONE_NO")
@ApiParam(value = "源存储区代码")
private String srcZoneNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 5eb33ca..0adc360 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -60,7 +60,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
- HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+ HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
@@ -161,12 +161,11 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
- HqlPack.getInPack(String.join(",", WmsEnumUtil.RC_ORDER_STATUS.CREATE.getValue() + "",
- WmsEnumUtil.RC_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
+ HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
+ WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
- HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
@@ -640,7 +639,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result);
- HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
+ HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
getStringBuilderPack(wmsASNMasterDetails, result);
@@ -667,7 +666,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result);
HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result);
- HqlPack.getStringEqualPack(wmsFGInStock.getErpWhNo(), "erpWhno", result);
+ HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
diff --git a/pom.xml b/pom.xml
index fdc926a..e5f0bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,12 @@
${project.version}
+
+ i3plus.pojo
+ i3plus-pojo-form
+ ${project.version}
+
+
com.fasterxml.jackson.core