金融报价单下载修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2232,7 +2232,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         filesList.add(xsddspFile);
         //生成金融报价单
         if ("002".equals(baseVehicleOut1.getTypeKey()) && "001".equals(baseVehicleOut1.getMaterialTypeKey())) {
-            String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
+            String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSidAndContractNo(baseVehicleOut1.getVinSid(),baseVehicleOutApply.getContractNo()).getData();
             if (StringUtils.isNotBlank(ckSid)) {
                 String jrbjdUrl = createjrbjdPdfHB(ckSid, baseVehicleOut1.getVinSid());
                 if (!"1".equals(jrbjdUrl)) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java

@@ -87,7 +87,7 @@ public interface BusDeliveredApplyDetailsFeign {
     ResultBean<List<BusDeliveredApplyDetails>> selectByApplySid(@RequestParam("sid") String sid);
 
     @ApiOperation("查询出库申请单sid")
-    @PostMapping("/fetchByVehSid")
+    @PostMapping("/fetchByVehSidAndContractNo")
     @ResponseBody
-    ResultBean<String> fetchByVehSid(@RequestParam("vinSid") String vinSid);
+    ResultBean<String> fetchByVehSidAndContractNo(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java

@@ -76,7 +76,7 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD
     }
 
     @Override
-    public ResultBean<String> fetchByVehSid(String vinSid) {
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid, String contractNo) {
         return null;
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -96,7 +96,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
 
     List<String> selectVinSidByApplySid(String sid);
 
-    String fetchByVehSid(String vinSid);
+    String fetchByVehSidAndContractNo(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo);
 
     int fetchByIsDeleteVinSid(String vinSid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml

@@ -77,12 +77,13 @@
           and bo.contractNo = ba.contractNo
     </select>
 
-    <select id="fetchByVehSid" resultType="java.lang.String">
+    <select id="fetchByVehSidAndContractNo" resultType="java.lang.String">
         SELECT ba.sid
         FROM bus_delivered_apply ba
                      JOIN bus_delivered_apply_details bd
                 ON ba.sid = bd.applySid
         WHERE bd.vinSid = #{vinSid}
+          AND ba.contractNo = #{contractNo}
           AND ba.nodeState = '已办结'
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java

@@ -99,7 +99,7 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei
     }
 
     @Override
-    public ResultBean<String> fetchByVehSid(String vinSid) {
-        return busDeliveredApplyDetailsService.fetchByVehSid(vinSid);
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid,String contractNo) {
+        return busDeliveredApplyDetailsService.fetchByVehSidAndContractNo(vinSid,contractNo);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -217,9 +217,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
         return baseMapper.selectVinSidByApplySid(sid);
     }
 
-    public ResultBean<String> fetchByVehSid(String vinSid) {
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid,String contractNo) {
         ResultBean rb = ResultBean.fireFail();
-        String ckSid = baseMapper.fetchByVehSid(vinSid);
+        String ckSid = baseMapper.fetchByVehSidAndContractNo(vinSid,contractNo);
         return rb.success().setData(ckSid);
     }