Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -3322,6 +3322,8 @@
                AIR.DUE_DATE             "saleDateOfReceipt",
                AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
                RW1.WAREHOUSE_NAME       "shipperName",
+               RW1.WAREHOUSE_NAME       "loadName",
+               RW.WAREHOUSE_NAME        "unloadName",
                RW.WAREHOUSE_NAME        "consigneeCompanyName"
               FROM OMSTRUCK_ORDER OO
               LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
@@ -3427,6 +3429,8 @@
         AIR.DUE_DATE             "saleDateOfReceipt",
         AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
         RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
         RW.WAREHOUSE_NAME        "consigneeCompanyName",
         (
         SELECT TTTR2.RESULT_TIME