diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 48ec1381a..5f102bc12 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -397,7 +397,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND d.del_flag = 1 LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number WHERE - c.del_flag = 1 and d.STATUS = 1 + c.del_flag = 1 and d.STATUS = 1 and e.STATUS = 4 AND e.warehouse_id = a.warehouse_id AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id) AND c.material_base_info_id = a.material_base_info_id @@ -444,10 +444,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM OUT_MATERIAL_DETAIL c LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER + LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER WHERE - d.CHECK_STATUS = 2 + d.CHECK_STATUS = 2 and e.STATUS = 1 AND d.DEL_FLAG = 1 AND c.DEL_FLAG = 1 + and e.del_flag = 1 AND d.warehouse_id = a.warehouse_id AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id) AND c.material_base_info_id = a.material_base_info_id