修改

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

@@ -900,18 +900,13 @@
     WHERE ASM.EAS_PRIMARY_ID = #{FSALEORDERENTRYID}
   </update>
   <select id="getSaleMaterialWeight" resultType="java.lang.Integer" parameterType="map">
-    SELECT COUNT(TWR.RESULT_TOTAL_ID)  FROM OMSTRUCK_ORDER OO
-    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-    ON TTR.ORDER_ID = OO.ORDER_ID
+    SELECT COUNT(TWR.RESULT_TOTAL_ID)+COUNT(ASM.WEIGHT_BATCH_ID)
+    FROM AMS_SALE_MATERIAL  ASM
     LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-    ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    ON ASM.SALE_MATERIAL_ID = TWR.SALE_MATERIAL_ID
     WHERE
     TWR.RESULT_NET_WEIGHT IS NOT NULL
-    AND
-    TWR.MATERIAL_ID = (select ASM.MATERIAL_ID from AMS_SALE_MATERIAL ASM where ASM.SALE_MATERIAL_ID = #{saleMaterialId})
     AND TWR.SALE_MATERIAL_ID = #{saleMaterialId}
-    AND
-    OO.ORDER_ID = #{orderId}
   </select>
     <select id="getAbleFlcount" resultType="java.lang.Integer" parameterType="decimal">
       SELECT

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

@@ -935,12 +935,24 @@
         WHERE TTR.ORDER_ID = #{orderId}
     </select>
     <select id="selectNetWeightCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
-        SELECT COUNT(TWR.WEIGHT_TASK_RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
-        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        SELECT
+            COUNT(TWR.RESULT_TOTAL_ID)+COUNT(ASM.WEIGHT_BATCH_ID)
+        FROM OMSTRUCK_ORDER OO
+         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                   ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
+         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                   ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                   ON ADSO .SALE_ORDER_MATERIAL_ID = ASOM .SALE_ORDER_MATERIAL_ID
+         LEFT JOIN AMS_SALE_MATERIAL ASM
+                   ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                   ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
+         LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
+                   ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         WHERE
         TWR.RESULT_NET_WEIGHT IS NOT NULL
-        AND TTR.ORDER_ID = #{orderId}
+        AND OO.ORDER_ID  = #{orderId}
     </select>
     <select id="getOrderIdsBySale" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
         SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO