退车申请下推销售退货单修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/ReturnPushVo.java

@@ -13,4 +13,6 @@ public class ReturnPushVo {
     private String billNo;
 
     private String materialCode;
+
+    private String typeKey;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java

@@ -90,4 +90,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
     int updateByBorrowSid(String s);
 
 	ReturnPushVo selectByVinSid(String vehSid);
+
+	List<ReturnPushVo> selectByBillNo(String billNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -79,9 +79,16 @@
     </update>
 
     <select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
-        SELECT ba.billNo,bo.materialCode
+        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 bo.isDelete = 0 and bo.vinSid = #{vehSid}
     </select>
+
+    <select id="selectByBillNo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
+        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
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -705,6 +705,31 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                                         salesReturnDetailDto.setFOwnerId(vehicleSelectVo.getOrgCode());*/
                                         busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
                                     }
+                                    //对已经出库的车推送销售退货单----------2025-04-03
+                                    SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
+                                    ReturnPushVo returnPushVo = baseMapper.selectByVinSid(vehSid);
+                                    if (returnPushVo != null) {
+                                        salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
+                                        salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
+                                        if("002".equals(returnPushVo.getTypeKey())){//贷款车
+                                            int j = 1;
+                                            List<ReturnPushVo> returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo());
+                                            returnPushVoList.removeAll(Collections.singleton(null));
+                                            if(!returnPushVoList.isEmpty()){
+                                                for (int k = 0; k < returnPushVoList.size(); k++) {
+                                                    ReturnPushVo l = returnPushVoList.get(k);
+                                                    if(l.getMaterialCode().equals(returnPushVo.getMaterialCode())){
+                                                        String temporaryNumZc = String.format("%02d", j);
+                                                        salesReturnDetailDto.setBillNo(returnPushVo.getBillNo()+ "-"+temporaryNumZc);
+                                                        j++;
+                                                        break;
+                                                    }
+                                                }
+                                            }
+
+                                        }
+                                        salesReturnDetailDtoList.add(salesReturnDetailDto);
+                                    }
                                     List<BaseSalesReturnVo> returnVos = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
                                     if (null != returnVos) {
                                         if (!returnVos.isEmpty()) {
@@ -752,14 +777,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         //删除推送的单车返利管理
                         scmVehRebateFeign.delByVehSid2(vehSid, busSalesOrderReturnVehApply.getUseOrgSid(), "029");
 
-                        //对已经出库的车推送销售退货单----------2025-04-03
-                        SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
-                        ReturnPushVo returnPushVo = baseMapper.selectByVinSid(vehSid);
-                        if (returnPushVo != null) {
-                            salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
-                            salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
-                            salesReturnDetailDtoList.add(salesReturnDetailDto);
-                        }
+
 
 
                     }