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 2e4c55f..179c7b6 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 @@ -34,18 +34,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("订单号") public String orderNo; - /** - * 单据类型:REG=原物料采购, - * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 - */ @Column(name = "ASN_TYPE") @ApiParam("单据类型") public String asnType; - /** - * 状态:1=新建,10=收货中,20=收货完成, - * 30=入库中,40=入库完成,90=已关闭,91=已取消 - */ @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; @@ -74,7 +66,4 @@ public class WmsASNMaster extends BaseBean { @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; - @Transient - @ApiParam(value = "单据明细集合") - public List wmsASNMasterDetailsList; } 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 ff1b98b..640d69e 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 @@ -56,11 +56,11 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("PO行号") public String poItem; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") public String planTime; @@ -110,16 +110,4 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam(value = "已收数量", example = "0") public Double recQty; - @Override - public String toString() { - return "WmsASNMasterDetails{" + - "recQty=" + recQty + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", item=" + item + - ", qty=" + qty + - ", unit='" + unit + '\'' + - ", orderNo='" + orderNo + '\'' + - '}'; - } } 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 ec2dbfd..68a1b12 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 @@ -55,9 +55,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam(value = "客户编号") - private String customerNo; + private String custNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") 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 6e62522..f65e744 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 @@ -67,13 +67,13 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; - @Column(name = "ZDATE") + @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; - @Column(name = "ZTIME") + @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; @Column(name = "ERP_WH_NO") @ApiParam("默认收货库存地") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 9663b9f..8c1eae2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -52,9 +52,9 @@ public class WmsQCMaster extends BaseBean { @ApiParam("备注") public String remark; - @Column(name = "CUSTOMER_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") - public String customerNo; + public String custNo; @Column(name = "VENDOR_NO") @ApiParam("供应商编号") 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 2bfbed9..9d209d1 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 @@ -58,8 +58,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -116,7 +116,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result); getStringBuilderPack(wmsDocMovementMaster, result);