修改

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

@@ -906,30 +906,34 @@
   <select id="getWagonNo" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
     select *
     from (
-    select TLR.RESULT_WAGON_NO     "resultWagonNo",
-    TLR.RESULT_ID           "resultId",
-    TLR.UNLOADING_POINT_ID    "unloadingPointId",
-    RW.WAREHOUSE_NAME         "warehouseName",
-    to_char(TLR.RESULT_LOADING_DATE ,'yyyy-mm-dd') "resultLoadingDate",
-    APO.PURCHASE_ORDER_NO   "purchaseOrderNo",
-    RM.MATERIAL_NAME        "materialName",
-    APO.PURCHASE_ORDER_ID     "purchaseOrderId",
+    SELECT
+    TLR.RESULT_WAGON_NO "resultWagonNo",
+    TLR.RESULT_ID "resultId",
+    TLR.UNLOADING_POINT_ID "unloadingPointId",
+    RW.WAREHOUSE_NAME "warehouseName",
+    to_char( TLR.RESULT_LOADING_DATE, 'yyyy-mm-dd' ) "resultLoadingDate",
+    APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+    RM.MATERIAL_NAME "materialName",
+    APO.PURCHASE_ORDER_ID "purchaseOrderId",
     DBI.INFACTORY_SHIP_NAME "infactoryShipName",
-    DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName"
-    from TMSTRAIN_LOADING_RESULT TLR
-    left join AMS_PURCHASE_ORDER APO
-    on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
-    left join DIL_BATCH DB
-    on DB.BATCH_ID = APO.BATCH_ID
-    left join DIL_BATCH_INFACOTRY DBI
-    on DBI.BATCH_ID = DB.BATCH_ID
-    left join RMS_MATERIAL RM
-    on DB.MATERIAL_ID = RM.MATERIAL_ID
-    left join RMS_WAREHOUSE   RW
-    on RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
-    where TLR.DELETED not in (2, 1)
-    and TLR.RESULT_TYPE = #{resultType}
-    and TLR.PURCHASE_ORDER_RAIL_PLAN_ID is not null
+    DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+    TWR.RESULT_NET_WEIGHT "resultNetWeight",
+    TWR.RESULT_GROSS_WEIGHT "grossWeight",
+    TWR.RESULT_TARE_WEIGHT "tareWeight"
+    FROM
+    TMSTRAIN_LOADING_RESULT TLR
+    LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+    LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = APO.BATCH_ID
+    LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_ID = DB.BATCH_ID
+    LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID = RM.MATERIAL_ID
+    LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
+    LEFT JOIN TMSTRAIN_TOTAL_RESULT TTR ON TTR.LOADING_ID = TLR.RESULT_ID
+    LEFT JOIN TMSTRAIN_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.TOTAL_RESULT_ID
+    WHERE
+    TLR.DELETED NOT IN ( 2, 1 )
+    AND TLR.RESULT_TYPE = #{resultType}
+    AND TLR.PURCHASE_ORDER_RAIL_PLAN_ID IS NOT NULL
+    AND TWR.RESULT_NET_WEIGHT IS NOT NULL
     <if test="wagon!=null and wagon!=''.toString()">
       and TLR.RESULT_WAGON_NO like concat('%',concat(#{wagon},'%'))
     </if>