diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index a6100efd3..3ff0cfc9a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -185,7 +185,7 @@ lwtg.create_user operateUser FROM logpm_warehouse_tray_goods lwtg - JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id + JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id