xiugai luobang bug

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

@@ -1417,7 +1417,7 @@
   left join amstruck_inward_requirement air
     on air.requirement_id = arp.requirement_id
   left join AMS_PURCHASE_ORDER APO
-    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+    on APO.PURCHASE_ORDER_ID = air.PURCHASE_ORDER_ID
   left join DIL_BATCH DB
     on DB.BATCH_ID = APO.BATCH_ID
   left join OMSTRUCK_ORDER_MATERIAL OOM

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

@@ -1322,7 +1322,7 @@
         left join amstruck_inward_requirement air
         on air.requirement_id = arp.requirement_id
         LEFT JOIN AMS_PURCHASE_ORDER APO
-        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        ON APO.PURCHASE_ORDER_ID = air.PURCHASE_ORDER_ID
         LEFT JOIN DIL_BATCH DB
         ON DB.BATCH_ID = APO.BATCH_ID
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM

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

@@ -628,8 +628,14 @@
                             on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                   left join OMSTRUCK_ORDER OO
                             on OO.ORDER_ID = TTR.ORDER_ID
+                  left join AMSTRUCK_INWARD_PLAN AIP
+                            on AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                  left join AMSTRUCK_REQUIREMENT_PLAN ARP
+                            on ARP.PLAN_ID = AIP.PLAN_ID
+                  left join AMSTRUCK_INWARD_REQUIREMENT AIR
+                            on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
                   left join AMS_PURCHASE_ORDER APO
-                            on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                            on APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
                   left join DIL_BATCH DB
                             on DB.BATCH_ID = APO.BATCH_ID
                   left join RMS_CAPACITY RC

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

@@ -786,7 +786,6 @@
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
         AND OO.ORDER_TYPE = 10
-        order by tur.result_end_time desc
         )
         <where>
             <if test="orderNumber != null">

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

@@ -1992,14 +1992,14 @@
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
-        left join amstruck_inward_plan aip
-        on aip.plan_id = oo.order_plan_id
-        left join amstruck_requirement_plan arp
-        on arp.plan_id = aip.plan_id
-        left join amstruck_inward_requirement air
-        on air.requirement_id = arp.requirement_id
+        left join AMSTRUCK_INWARD_PLAN AIP
+        on AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        left join AMSTRUCK_REQUIREMENT_PLAN ARP
+        on ARP.PLAN_ID = AIP.PLAN_ID
+        left join AMSTRUCK_INWARD_REQUIREMENT AIR
+        on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join AMS_PURCHASE_ORDER APO
-        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        on APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         left join DIL_BATCH DB
         ON DB.BATCH_ID = APO.BATCH_ID
         left join RMS_CAPACITY RC