timiap

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

@@ -1944,8 +1944,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
-                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 12:
             case 13:

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

@@ -3223,7 +3223,9 @@
                OO.ORDER_STATUS        "orderStatus",
                RS.SHIPPER_NAME        "shipperUnitName",
                AIR.REQUIREMENT_ID     "requirementId",
-               AIR.DUE_DATE             "saleDateOfReceipt"
+               AIR.DUE_DATE             "saleDateOfReceipt",
+               RW1.WAREHOUSE_NAME       "shipperName",
+               RW.WAREHOUSE_NAME        "consigneeCompanyName"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
                            ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3235,7 +3237,13 @@
                            ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        where oo.order_id = #{orderId}
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW1
+                           ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+         where oo.order_id = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>