Merge remote-tracking branch 'origin/master'

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml

@@ -225,9 +225,9 @@
         FROM
         wms_inventory_record wir
         LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
-        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
-        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid
         LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
         where w.warehouseTypeValue = '旧件库'
@@ -278,9 +278,9 @@
         FROM
         wms_inventory_record wir
         LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
-        LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
+        LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
-        LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid
         LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
         where w.warehouseTypeValue = '旧件库'