BH-CODE 出库，绑定

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;

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;
 

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;
 

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();

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;
 }

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)