优化

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

@@ -42,6 +42,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -137,6 +139,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
     private BusSalesOrderModelFeign busSalesOrderModelFeign;
+    @Autowired
+    private BusSalesOrderMakeupFeign busSalesOrderMakeupFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@@ -2316,7 +2320,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //采购单位 TODO
         }
         //查询上装信息
-
+        BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicleOut.getVinNo(), baseVehicleOutApply.getCreateOrgSid());
+        if (baseVehinstallDetailsVo != null){
+            BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupFeign.selectTop(baseVehinstallDetailsVo.getSid(), busSalesOrder.getSid()).getData();
+            if (busSalesOrderMakeup != null){
+                //上装名称
+                baseQuotationVo.setSzOneName(busSalesOrderMakeup.getTopName());
+                //上装采购单位
+                baseQuotationVo.setSzOnePurUnit(busSalesOrderMakeup.getRefitFactory());
+            }
+        }
         return null;
     }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java

@@ -64,4 +64,8 @@ public interface BusSalesOrderMakeupFeign {
     @ResponseBody
     ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(@PathVariable(value = "sid") String sid);
 
+    @ApiOperation("根据上装sid和销售订单sid查询销售订单上装信息")
+    @PostMapping("/selectTop")
+    @ResponseBody
+    ResultBean<BusSalesOrderMakeup> selectTop(@RequestParam("topSid") String topSid,@RequestParam("orderSid") String orderSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java

@@ -55,4 +55,9 @@ public class BusSalesOrderMakeupFeignFallback implements BusSalesOrderMakeupFeig
     public ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusSalesOrderMakeup> selectTop(String topSid, String orderSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -32,6 +32,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetail
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -90,4 +91,7 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
     List<BusSalesOrderMakeup> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
 
     BusSalesOrderMakeup selectBySid(String sid);
+
+    @Select("select * from bus_sales_order_makeup where topSid = #{topSid} and salesOrderSid = #{orderSid}")
+    BusSalesOrderMakeup selectTopNew(@Param("topSid") String topSid,@Param("orderSid") String orderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
@@ -64,4 +65,9 @@ public class BusSalesOrderMakeupRest implements BusSalesOrderMakeupFeign {
     public ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(String sid) {
         return busSalesOrderMakeupService.getTopInfo(sid);
     }
+
+    @Override
+    public ResultBean<BusSalesOrderMakeup> selectTop(String topSid, String orderSid) {
+        return busSalesOrderMakeupService.selectTopNew(topSid, orderSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -269,4 +269,10 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public BusSalesOrderMakeup selectBySid(String sid) {
         return baseMapper.selectBySid(sid);
     }
+
+    public ResultBean<BusSalesOrderMakeup> selectTopNew(String topSid, String orderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderMakeup busSalesOrderMakeup = baseMapper.selectTopNew(topSid,orderSid);
+        return rb.success().setData(busSalesOrderMakeup);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -320,7 +320,7 @@ public class InvoicedService {
     public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
-        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        BeanUtil.copyProperties(dto, finBillCompleteDto, "carBuyContractImages");
         finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         ResultBean resultBean = finBillApplicationFeign.complete(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
@@ -510,7 +510,7 @@ public class InvoicedService {
     public ResultBean agreeInvoicedInfoKP(InvoicedDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
-        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        BeanUtil.copyProperties(dto, finBillCompleteDto, "carBuyContractImages");
         finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         //附件信息
         List<String> appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同