欠款开票

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -117,4 +117,8 @@ public interface BaseTrailerFeign {
     @ApiOperation("查询主车的挂车信息")
     @GetMapping("/trailerList")
     ResultBean<TraliveredVo> trailerList(@RequestParam("vinSid") String vinSid);
+
+    @ApiOperation("根据挂车车架号获取一条记录")
+    @GetMapping("/fetchByGcVinNo/{gcVinNo}")
+    ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(@PathVariable("gcVinNo") String gcVinNo);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -90,4 +90,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     int selectNumGCRK(String bill);
 
     List<TrailerVo> trailerList(String vinSid);
+
+    @Select("select * from base_trailer where vinNo = #{gcVinNo}")
+    BaseTrailerDetailsVo fetchByGcVinNo(String gcVinNo);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -114,4 +114,9 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 	public ResultBean<TraliveredVo> trailerList(String vinSid) {
 		return baseTrailerService.trailerList(vinSid);
 	}
+
+	@Override
+	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
+		return baseTrailerService.fetchByGcVinNo(gcVinNo);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -728,4 +728,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         traliveredVo.setList(voList);
         return rb.success().setData(traliveredVo);
     }
+
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNo(gcVinNo);
+        return rb.success().setData(baseTrailerDetailsVo);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java

@@ -70,4 +70,6 @@ public class FinBillTrailerVo implements Vo {
 	@ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
 
+    @ApiModelProperty("合格证图片")
+    private String hgzImageUrl; // 合格证图片
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
@@ -371,6 +372,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         vo.setFinBillVehicles(finBillVehicleVos);
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         if (finBillTrailerVos.size() > 0) {
+            for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
+                List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+                    if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                        finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
+                    }
+                }
+            }
             vo.setFinBillTrailers(finBillTrailerVos);
         } else {
             for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
@@ -386,6 +396,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue());
                     finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid());
                     finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName());
+                    //根据挂车车架号查询挂车信息以及合格证照片路径
+                    BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
+                    List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
+                    for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
+                            finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
+                        }
+                    }
                     finBillTrailerVos.add(finBillTrailerVo);
                 }
             }