2026-03-03

优化

src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml

@@ -18,7 +18,7 @@
         FROM inbound_notification_head h
         LEFT JOIN inbound_notification_detail d ON h.site = d.site and h.bu_no = d.bu_no and h.order_no = d.order_no
         INNER JOIN ShopOrder sh ON d.site = sh.site and d.bu_no = sh.bu_no and  d.related_order_no = sh.OrderNo and d.part_no = sh.PartNo
-        INNER JOIN SFDC_Rolls pr ON sh.site = pr.site and sh.bu_no = pr.bu_no and  sh.OrderNo = pr.OrderNo
+        INNER JOIN SFDC_Rolls pr ON sh.site = pr.site and sh.bu_no = pr.bu_no and  sh.OrderNo = pr.OrderNo AND D.roll_no = PR.RollNo
         WHERE h.site = #{site} and h.bu_no in (select bu_no from AccessBu where username = #{userName})
         AND h.order_type = '生产入库' and d.in_warehouse = #{warehouseId} AND h.order_status = '待入库'
         <if test="searchCode != null and searchCode != ''">