修改

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,6 +935,7 @@
         WHERE TTR.ORDER_ID = #{orderId}
     </select>
     <select id="selectNetWeightCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+<<<<<<< HEAD
         SELECT COUNT(TWB.WEIGHT_BATCH_ID)  FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -945,7 +946,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
         ON TWB.WEIGHT_BATCH_ID = ASM.WEIGHT_BATCH_ID
         WHERE TWB.BATCH_NET_WEIGHT IS NOT NULL
-        AND OO.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