2 Коміти 0f7b51b8ec ... 9b7c191f17

Автор SHA1 Опис Дата
  zx 9b7c191f17 Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API 2 роки тому
  zx babc9a99b6 xiugai1 2 роки тому

+ 2 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -2297,6 +2297,7 @@
     left join OMSTRUCK_ORDER_MATERIAL o_o_material
     on o_order.order_id=o_o_material.ORDER_ID
     where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
+    AND o_order.ORDER_TYPE=2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
     ) sumWeight2
@@ -2311,6 +2312,7 @@
     left join Tmstruck_Weight_Result t_w_result
     on t_t_result.result_total_id=t_w_result.result_total_id
     where o_order.order_status in (2,4,5)
+    AND o_order.ORDER_TYPE=2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID