diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 0cee07c..152de1f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -107,4 +107,36 @@ public class SwebEnumUtil { } } + /** + * 包装类型枚举 + */ + @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(集装箱)"); + + private String code; + private String description; + int value; + + PACKAGE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 1c0f96d..61f0e26 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -95,4 +95,8 @@ public class SwebPurchaseOrder extends BaseBean { @Column(name = "REF_ORDER_NO") @ApiParam(value = "关联单号") public String refOrderNo; + + @Column(name = "EXPECTED_TIME") + @ApiParam(value = "预计到货时间") + public String expectedTime; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 8a07f39..a47f959 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -130,9 +130,9 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer IS_STEEL; - @Column(name = "REC_TIME") + @Column(name = "EXPECTED_TIME") @ApiParam(value = "预计到货日期") - public String recTime; + public String expectedTime; @Column(name = "REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index 6d17e46..fc22889 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -24,10 +24,10 @@ public class SwebPOForPubListEnterModel extends BaseBean { public Integer orderType; @ApiParam(value = "预计到货日期开始日期") - public String recTimeStart; + public String expectedTimeStart; @ApiParam(value = "预计到货日期结束日期") - public String recTimeEnd; + public String expectedTimeEnd; @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 6f9eb24..4629b42 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -64,7 +64,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); - DdlPreparedPack.timeBuilder(model.getRecTimeStart(), model.getRecTimeEnd(), "recTime", result, false); + DdlPreparedPack.timeBuilder(model.getExpectedTimeStart(), model.getExpectedTimeEnd(), "expectedTime", result, false); // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);