提交代码

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -92,6 +92,10 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     Map<String, Object> getPriceByCarrierAndPlace(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> mapValue);
+
+    //查询出地址
+    String getshippingAddress(BigDecimal saleShippingAddressId);
+
     // 展示未匹配承运商的车序号
     List<Map<String, Object>> getSteelTruckNoList(Map<String, Object> mapValue);
     // 车序号下的物资

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1080,6 +1080,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> map) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListToCarrier(map);
+        if (resultList.isEmpty()){
+
+        }else {
+            for (Map<String, Object> stringObjectMap : resultList) {
+                BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
+                String address = amsSaleOrderMapper.getshippingAddress(saleShippingAddressId);
+                stringObjectMap.put("saleShippingAddress",address);
+            }
+        }
         return resultList;
     }
 

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -2580,7 +2580,8 @@
     RM.MATERIAL_MODEL "materialModel",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     ASM.MATERIAL_NUMBER "materialNumber",
-    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    ASOM.SALE_SHIPPING_ADDRESS_ID "saleShippingAddressId"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
@@ -2722,6 +2723,18 @@
     order by "updateTime" DESC
   </select>
 
+  <select id="getshippingAddress" resultType="java.lang.String">
+     select
+     distinct
+     RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
+     ||RRP.ADDRESS_DELIVERY_ADDRESS "saleShippingAddress" FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        WHERE ASOM.SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId}
+  </select>
+
   <select id="getSaleOrderListByCarrierSsoId" resultType="java.util.Map">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",