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 1af168cfd5..0cd5fd895c 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 selectByBillNo(String billNo); - List selectGcSzByVinSid(String vehSid); + List selectGcSzByBillNo(String billNo); } \ 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 2cf3a5200e..6b26d7d6b2 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 @@ -92,10 +92,10 @@ where bo.materialTypeKey = '001' and ba.billNo = #{billNo} order by bo.id asc - 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.vinSid = #{vehSid} order by bo.id asc + where bo.materialTypeKey != '001' and ba.billNo = #{billNo} order by bo.id asc \ 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 b5a369886d..730716201e 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 returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); 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 returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); 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 returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); returnPushVos.removeAll(Collections.singleton(null)); for (int m = 0; m < returnPushVos.size(); m++) { ReturnPushVo returnPushVo1 = returnPushVos.get(m); @@ -1506,7 +1506,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService salesReturnDetailDtoList = new ArrayList<>(); //对已经出库的车推送销售退货单----------2025-04-03 @@ -1525,7 +1525,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); returnPushVos.removeAll(Collections.singleton(null)); for (int m = 0; m < returnPushVos.size(); m++) { if (m == 0) { @@ -1535,11 +1535,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); returnPushVos.removeAll(Collections.singleton(null)); for (int m = 0; m < returnPushVos.size(); m++) { if (m == 0) { @@ -1557,13 +1558,14 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService returnPushVos = baseMapper.selectGcSzByVinSid(vehSid); + List returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); returnPushVos.removeAll(Collections.singleton(null)); for (int m = 0; m < returnPushVos.size(); m++) { ReturnPushVo returnPushVo1 = returnPushVos.get(m); SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto(); salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode()); - salesReturnDetailDto.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz); + salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz); + salesReturnDetailDtoList.add(salesReturnDetailDto1); } } salesReturnDetailDtoList.add(salesReturnDetailDto);