O新增订单增加字段

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -310,10 +310,14 @@ public class BusinessDocumentOrderApplicationService {
                         billMap.put("unitPrice", "");
                         billMap.put("entTotal", "");
                     }
-                    // 最终目的国（收货地）
-                    billMap.put("destinationCountry", order.getUnloadName() != null ? order.getUnloadName() : "");
-                    // 境内货源地（发货地）
-                    billMap.put("domesticSourcePlace", order.getLoadingName() != null ? order.getLoadingName() : "");
+                    // 最终目的国（优先取订单填写，未填写则取收货地）
+                    String destinationCountry = (order.getDestinationCountry() != null && !order.getDestinationCountry().isEmpty())
+                            ? order.getDestinationCountry() : order.getUnloadName();
+                    billMap.put("destinationCountry", destinationCountry != null ? destinationCountry : "");
+                    // 境内货源地（优先取订单填写，未填写则取发货地）
+                    String domesticSourcePlace = (order.getDomesticSourcePlace() != null && !order.getDomesticSourcePlace().isEmpty())
+                            ? order.getDomesticSourcePlace() : order.getLoadingName();
+                    billMap.put("domesticSourcePlace", domesticSourcePlace != null ? domesticSourcePlace : "");
                     billList.add(billMap);
                 }
             }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java

@@ -760,6 +760,12 @@ public class BusinessDocumentOrder extends BaseVOEntity{
     @ApiModelProperty("进出口方式：I-进口，E-出口")
     private String ieType;
 
+    @ApiModelProperty("境内货源地")
+    private String domesticSourcePlace;
+
+    @ApiModelProperty("最终目的国（地区）")
+    private String destinationCountry;
+
     @ApiModelProperty("推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -786,6 +786,12 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @ApiModelProperty("进出口方式：I-进口，E-出口")
     private String ieType;
 
+    @ApiModelProperty("境内货源地")
+    private String domesticSourcePlace;
+
+    @ApiModelProperty("最终目的国（地区）")
+    private String destinationCountry;
+
     @ApiModelProperty("推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -800,6 +800,12 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     @ApiModelProperty("进出口方式：I-进口，E-出口")
     private String ieType;
 
+    @ApiModelProperty("境内货源地")
+    private String domesticSourcePlace;
+
+    @ApiModelProperty("最终目的国（地区）")
+    private String destinationCountry;
+
     @ApiModelProperty("推送状态：1-未推送 2-推送中 3-推送成功 4-推送失败")
     private Integer pushStatus;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -845,6 +845,12 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "原产国")
     private String originCountry;
 
+    @ApiModelProperty(value = "境内货源地")
+    private String domesticSourcePlace;
+
+    @ApiModelProperty(value = "最终目的国（地区）")
+    private String destinationCountry;
+
     @ApiModelProperty(value = "物料明细列表")
     private List<OrderWithMaterialDTO> orderWithMaterialDTOList;
 

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -169,6 +169,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="topOrganizationId"    column="TOP_ORGANIZATION_ID"    />
         <result property="documentDate"    column="DOCUMENT_DATE"    />
         <result property="ieType"    column="IE_TYPE"    />
+        <result property="domesticSourcePlace"    column="DOMESTIC_SOURCE_PLACE"    />
+        <result property="destinationCountry"    column="DESTINATION_COUNTRY"    />
         <result property="materialCode"    column="MATERIAL_CODE"    />
         <result property="pushBy"    column="PUSH_BY"    />
         <result property="pushByName"    column="PUSH_BY_NAME"    />