'提货单和送货单'

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

@@ -1039,10 +1039,9 @@
             rca.address_province "province",
             rca.address_district "district",
             rca.address_town "town",
-            rca.address_delivery_address "deliveryAddress",
+            rrp.address_delivery_address "deliveryAddress",
             asom.sale_order_consignee "consignee",
             asom.sale_order_consignee_tel "consigneeTel",
-            asom.sale_date_of_receipt "receiptDate",
             rsh.SHIPPER_NAME "shippername",
             sysdate "sendDate"
         from omstruck_order oo
@@ -1071,9 +1070,13 @@
              on
                  rcr.carrier_id = adso.carrier_id
                  left join
+             RMS_RECEIVE_PLACE rrp
+             on
+                 rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
+                 left join
              rms_receive_address rca
              on
-                 rca.address_id = asom.sale_shipping_address_id
+                 rca.address_id = rrp.ADDRESS_ID
         left join RMS_SHIPPER rsh
         on rsh.SHIPPER_ID = aso.SHIPPER_ID
         where oo.order_number =#{orderNumber}
@@ -1086,8 +1089,7 @@
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight",
-            ruom.unit_of_measure_name "measureName",
-            twr.RESULT_NET_WEIGHT "resultWeight"
+            tlr.RESULT_LOAD_START_TIME "makeDate"
         from omstruck_order oo
                  left join
              omstruck_order_material oom
@@ -1107,8 +1109,13 @@
                 left  join
             TMSTRUCK_WEIGHT_RESULT twr
             on
-                 twr.RESULT_TOTAL_ID =   ttr.ORDER_ID
+                 twr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
             and twr.MATERIAL_ID = oom.MATERIAL_ID
+                left  join
+            TMSTRUCK_LOAD_RESULT tlr
+            on
+                  tlr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
+            and tlr.MATERIAL_ID = oom.MATERIAL_ID
         where oo.order_number = #{orderNumber}
     </select>
     <!--零星物资出厂实绩列表 -->