From 369450e0819286df94d237a70a9321eaa49243c9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 18 Apr 2025 10:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8E=A8=E9=94=80?= =?UTF-8?q?=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=8C=82?= =?UTF-8?q?=E8=BD=A6=E5=92=8C=E4=B8=8A=E8=A3=85=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderReturnVehApplyMapper.java | 2 +- .../BusSalesOrderReturnVehApplyMapper.xml | 2 +- .../BusSalesOrderReturnVehApplyService.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) 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 selectByBillNo(String billNo); - List selectGcSzByBillNo(String billNo); + List 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 \ 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 returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List 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 returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List 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 returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List 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 returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List 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 returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List 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 returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo()); + List returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid); returnPushVos.removeAll(Collections.singleton(null)); for (int m = 0; m < returnPushVos.size(); m++) { ReturnPushVo returnPushVo1 = returnPushVos.get(m);