Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -39,11 +39,13 @@ import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -118,6 +120,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
 
     private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -440,7 +444,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
                     }
                     //推送开票管理
                     FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-                    finVehicleInvoiceDto.setInvoiceTitle(baseShuntingInvoicinApplyeVehDetailsVo.getInvoicinCompanyName());
+                    BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseShuntingInvoicinApplyeVehDetailsVo.getVinNo() , baseShuntingInvoicingApply.getCallOutOrgSid());
+                    FinCompanyInvoicingDetailsVo companyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsBySystem(baseVehicle.getPurchaseSystemSid()).getData();
+                    finVehicleInvoiceDto.setInvoiceTitle(companyInvoicingDetailsVo.getName());
                     finVehicleInvoiceDto.setContractNo("");
                     BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid());
                     FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java

@@ -67,6 +67,5 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper<ScmApplyInboun
     @Select("select * from scm_apply_inbound_veh_query where mainSid = #{cgrkdSid}")
     List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid);
 
-    @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE CONCAT('%',#{vinNo},'%')")
     ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(@Param("vinNo") String vinNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml

@@ -10,4 +10,19 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo">
 		SELECT * FROM scm_apply_inbound_veh_query <where> ${ew.sqlSegment} </where>
 	</select>
+    <select id="fetchDetailsByVinNo"
+            resultType="com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo">
+		SELECT
+			a.*
+		FROM
+			scm_apply_inbound_veh_query AS a
+				LEFT JOIN scm_apply_inbound_query AS q ON a.mainSid = q.sid
+				LEFT JOIN scm_apply_inbound AS i ON q.busSid = i.sid
+		WHERE
+			vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
+		  AND i.nodeState = '已办结'
+		ORDER BY
+			i.createTime asc
+			LIMIT 1
+	</select>
 </mapper>