From 86f6fefd5b1bc1d2df1782f63be88bd9092be1fe Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 29 May 2020 09:23:02 +0800 Subject: [PATCH] =?UTF-8?q?BH-CODE=20=E5=87=BA=E5=BA=93=EF=BC=8C=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java | 5 +++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java | 5 +++++ 6 files changed, 22 insertions(+), 6 deletions(-) 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 de4805e..065dce6 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 @@ -6976,8 +6976,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum APPROVAL_STATUS { APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"), - APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "已审批"), - APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝"); + APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"), + APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java index 1ed0ef1..1c7a2f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -56,7 +56,7 @@ public class WmsLogisticExpenseRecords extends BaseBean { @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输方式") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index 7d1d0cc..6ae56d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -43,6 +43,11 @@ public class WmsLogisticsCosts extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String placeOfOrigin; + @Column(name = "DESTINATION_WAREHOUSE") + @ApiParam(value = "目的仓库") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destinationWarehouse; + @Column(name = "SHIPPING_FLAG") @ApiParam(value = "发往地") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @@ -60,7 +65,7 @@ public class WmsLogisticsCosts extends BaseBean { @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java index eca5fa7..443acee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -71,7 +71,7 @@ public class WmsLogisticsFreightApproval extends BaseBean { private String logisticsVendorNo; @Column(name = "TRANSPORT_TYPE") - @ApiParam(value = "运输方式") + @ApiParam(value = "运输类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class) private Integer transportType; @@ -99,11 +99,12 @@ public class WmsLogisticsFreightApproval extends BaseBean { @Column(name = "is_urgent") @ApiParam(value = "是否紧急") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isUrgent; public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) { this.orderNo = docMovementMaster.getOrderNo(); + this.organizeCode = docMovementMaster.getOrganizeCode(); this.busiType = docMovementMaster.getBusiType(); this.organizeCode = docMovementMaster.getOrganizeCode(); this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java index 34e1394..fefe223 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java @@ -51,4 +51,9 @@ public class WmsProviderFlag extends BaseBean { @ApiParam(value = "发往地编号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; + + @Column(name = "SHIPPING_FLAG_NAME") + @ApiParam(value = "发往地编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shippingFlagName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java index 533834f..793d252 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -58,6 +58,11 @@ public class WmsShortLogisticsCosts extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String shippingFlag; + @Column(name = "DESTINATION_WAREHOUSE") + @ApiParam(value = "目的仓库") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destinationWarehouse; + @Column(name = "LOGISTICS_VENDOR_NO") @ApiParam(value = "物流供应商") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)