diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
index 0cd5fd895c..9302630474 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
@@ -93,5 +93,5 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
 
 	List<ReturnPushVo> selectByBillNo(String billNo);
 
-    List<ReturnPushVo> selectGcSzByBillNo(String billNo);
+    List<ReturnPushVo> selectGcSzByBillNo(@Param("billNo") String billNo,@Param("vinSid") String vinSid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
index 6b26d7d6b2..63396794ee 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
@@ -96,6 +96,6 @@
         SELECT ba.billNo,bo.materialCode,bo.typeKey
         FROM anrui_base.base_vehicle_out bo
                  left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
-        where bo.materialTypeKey != '001' and ba.billNo = #{billNo} order by bo.id asc
+        where bo.materialTypeKey != '001' and ba.billNo = #{billNo} and bo.vinSid = #{vinSid} order by bo.id asc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
index 730716201e..340426daad 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
@@ -721,7 +721,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                                     if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
                                                         String temporaryNumZc = String.format("%02d", j);
                                                         salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
-                                                        List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                                                        List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                                                         returnPushVos.removeAll(Collections.singleton(null));
                                                         for (int m = 0; m < returnPushVos.size(); m++) {
                                                             if (m == 0) {
@@ -736,7 +736,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                                         }
                                                         break;
                                                     } else {
-                                                        List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                                                        List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                                                         returnPushVos.removeAll(Collections.singleton(null));
                                                         for (int m = 0; m < returnPushVos.size(); m++) {
                                                             if (m == 0) {
@@ -754,7 +754,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                         }else{
                                             int x = 1;
                                             String temporaryNumGcOrSz = String.format("%02d", x);
-                                            List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                                            List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                                             returnPushVos.removeAll(Collections.singleton(null));
                                             for (int m = 0; m < returnPushVos.size(); m++) {
                                                 ReturnPushVo returnPushVo1 = returnPushVos.get(m);
@@ -1525,7 +1525,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
                             String temporaryNumZc = String.format("%02d", j);
                             salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
-                            List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                            List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                             returnPushVos.removeAll(Collections.singleton(null));
                             for (int m = 0; m < returnPushVos.size(); m++) {
                                 if (m == 0) {
@@ -1540,7 +1540,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                             }
                             break;
                         } else {
-                            List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                            List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                             returnPushVos.removeAll(Collections.singleton(null));
                             for (int m = 0; m < returnPushVos.size(); m++) {
                                 if (m == 0) {
@@ -1558,7 +1558,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             }else{
                 int x = 1;
                 String temporaryNumGcOrSz = String.format("%02d", x);
-                List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo());
+                List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
                 returnPushVos.removeAll(Collections.singleton(null));
                 for (int m = 0; m < returnPushVos.size(); m++) {
                     ReturnPushVo returnPushVo1 = returnPushVos.get(m);