diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
index 1e56e7f22..8413f9623 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java
@@ -507,12 +507,12 @@ public class GtAndFhbBizController extends BaseController {
             Map<String, StoreProductColor> buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR));
             // 根据步橘货号 找到FHB对应的货号，可能是列表
             List<String> fhbAtrNoList = Optional.ofNullable(multiSameFhbMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有FHB货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR));
-            fhbAtrNoList.forEach(fhbAtrNo -> {
-                // 处理档口客户商品优惠
-                this.handleCusDisc(fhbAtrNo, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList);
-                // 处理档口商品库存
-                this.handleProdStock(fhbAtrNo, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList);
-            });
+            // 取FHB第一个货号（因为可能对应FHB多个货号，只需取其中一个货号的优惠、库存等）
+            final String fhbAtrNo = fhbAtrNoList.get(0);
+            // 处理档口客户商品优惠
+            this.handleCusDisc(fhbAtrNo, fhbCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, storeProd.getStoreId(), storeProd.getId(), prodCusDiscList);
+            // 处理档口商品库存
+            this.handleProdStock(fhbAtrNo, fhbStockGroupMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList);
         });
         // 档口客户优惠
         this.storeCusProdDiscMapper.insert(prodCusDiscList);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java
index 800b66dba..3e837339c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndTyBizController.java
@@ -477,12 +477,12 @@ public class GtAndTyBizController extends BaseController {
             Map<String, StoreProductColor> buJuProdColorMap = Optional.ofNullable(prodColorGroupMap.get(storeProd.getId())).orElseThrow(() -> new ServiceException("没有商品颜色!" + storeProd.getProdArtNum(), HttpStatus.ERROR));
             // 根据步橘货号 找到TY对应的货号，可能是列表
             List<String> tyAtrNoList = Optional.ofNullable(multiSameTyMap.get(cleanArtNo)).orElseThrow(() -> new ServiceException("没有TY货号!" + storeProd.getProdArtNum(), HttpStatus.ERROR));
-            tyAtrNoList.forEach(tyAtrNo -> {
-                // 处理客户优惠
-                this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId());
-                // 处理档口商品库存
-                this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList);
-            });
+            // 取TY第一个货号（因为可能对应TY多个货号，只需取其中一个货号的优惠、库存等）
+            final String tyAtrNo = tyAtrNoList.get(0);
+            // 处理客户优惠
+            this.handleCusDisc(tyAtrNo, tyCusDiscGroupMap, buJuProdColorMap, buJuStoreCusMap, prodCusDiscList, storeProd.getStoreId(), storeProd.getId());
+            // 处理档口商品库存
+            this.handleProdStock(tyAtrNo, tyProdStockMap, buJuProdColorMap, storeProd.getStoreId(), storeProd.getId(), storeProd.getProdArtNum(), prodStockList);
         });
         // 档口客户优惠
         this.storeCusProdDiscMapper.insert(prodCusDiscList);
diff --git a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml
index 4f9e9e2af..a208a60ca 100644
--- a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml
@@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             store_product_color spc
                 JOIN store_product sp ON spc.store_prod_id = sp.id
-                LEFT JOIN store_customer_product_discount scpd ON scpd.store_prod_color_id = spc.id  AND scpd.del_flag = 0
+                LEFT JOIN store_customer_product_discount scpd ON scpd.store_prod_color_id = spc.id  AND scpd.del_flag = 0 AND scpd.store_cus_id = #{storeCusId}
         WHERE
             spc.del_flag = 0
             AND spc.id = #{storeProdColorId}