From c4832bb13989a57c162c8a71150b11b2e08bde39 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 10 Apr 2025 11:58:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderReturnVehApplyMapper.xml                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 d59a49288a..799f01f13a 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
@@ -80,8 +80,8 @@
 
     <select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
         SELECT ba.billNo,bo.materialCode
-        FROM base_vehicle_out bo
-                 left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+        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>
 </mapper>
\ No newline at end of file

From f82334fa4e13e0828d78b841938733b50e6902fb Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 10 Apr 2025 13:48:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E6=9C=AC=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../as/biz/asbusrepairbill/AsBusrepairBillService.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index f82e3e0625..12e9de0a56 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -463,10 +463,16 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     sitem.setBillSid(sid);
                     AsServiceItem item = asServiceItemService.fetchBySid(sitemVo.getServiceItemSid());
                     if (null != item) {
+                        BigDecimal examineHourPrice = BigDecimal.ZERO;//工时提成
+                        BigDecimal cost = BigDecimal.ZERO;//外协成本
                         if (null != item.getCost()) {
-                            sitem.setCost(item.getCost());
-                            sitem.setCostTotal(item.getCost());
+                            cost = item.getCost();
                         }
+                        if (null != item.getExamineHourPrice()) {
+                            examineHourPrice = item.getExamineHourPrice();
+                        }
+                        sitem.setCost(cost.add(examineHourPrice));
+                        sitem.setCostTotal(cost.add(examineHourPrice));
                     }
                     sitem.setBillBusTypeKey("002");
                     sitem.setBillBusTypeValue("维修项目");