xiugai

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

@@ -1082,7 +1082,7 @@
     </select>
 
     <select id="getDeliveryOrderMaterial" parameterType="java.lang.String" resultType="java.util.LinkedHashMap">
-        SELECT DISTINCT
+        SELECT
         rm.material_name "materialName",
         rm.material_specification "materialSpe",
         rm.material_model "materialModel",
@@ -1097,7 +1097,12 @@
         LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
         LEFT JOIN rms_material rm ON rm.material_id = ASM.MATERIAL_ID
         LEFT JOIN rms_unit_of_measure ruom ON ruom.unit_of_measure_id = rm.unit_of_measure_id
-        where oo.order_number = #{orderNumber}
+        where
+        ASM.DELETED IS NULL
+        AND
+        ASM.SALE_MATERIAL_ID IS NOT NULL
+        AND
+        oo.order_number = #{orderNumber}
     </select>
     <!--零星物资出厂实绩列表 -->
     <select id="getSporadicLeaveFactory" parameterType="java.util.Map" resultType="java.util.Map">