Merge remote-tracking branch 'origin/master'

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
+        FROM anrui_base.base_vehicle_out bo
-                 left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+                 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>

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());
+                            cost = item.getCost();
-                            sitem.setCostTotal(item.getCost());
                         }
+                        if (null != item.getExamineHourPrice()) {
+                            examineHourPrice = item.getExamineHourPrice();
+                        }
+                        sitem.setCost(cost.add(examineHourPrice));
+                        sitem.setCostTotal(cost.add(examineHourPrice));
                     }
                     sitem.setBillBusTypeKey("002");
                     sitem.setBillBusTypeValue("维修项目");