Merge remote-tracking branch 'origin/master'

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

@@ -114,6 +114,10 @@ public interface BaseTrailerFeign {
     @PostMapping("/trailerOut/{sid}")
     ResultBean trailerOut(@PathVariable("sid") String sid);
 
+    @ApiOperation("挂车单独出库(新)")
+    @PostMapping("/trailerOutNew/{sid}")
+    ResultBean trailerOutNew(@PathVariable("sid") String sid);
+
     @ApiOperation("查询主车的挂车信息/上装信息")
     @GetMapping("/trailerList")
     ResultBean<TraliveredVo> trailerList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo);

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

@@ -84,6 +84,11 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean trailerOutNew(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -63,6 +63,8 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String saleDate;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("出库单sid")
+    private String mainSid;
 
     @ApiModelProperty("上装/挂车名称")
     private String trailerOrInstallName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -87,4 +87,8 @@ public interface BaseVehinstallFeign {
     @ApiOperation("上装出库")
     @PostMapping("/vehinstallOut/{sid}")
     ResultBean vehinstallOut(@PathVariable("sid") String sid);
+
+    @ApiOperation("上装单独出库(新)")
+    @PostMapping("/vehinstallOutNew/{sid}")
+    ResultBean vehinstallOutNew(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -84,4 +84,9 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 	public ResultBean vehinstallOut(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean vehinstallOutNew(String sid) {
+		return null;
+	}
 }

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

@@ -110,6 +110,11 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 		return baseTrailerService.trailerOut(sid);
 	}
 
+	@Override
+	public ResultBean trailerOutNew(String sid) {
+		return baseTrailerService.trailerOutNew(sid);
+	}
+
 	@Override
 	public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
 		return baseTrailerService.trailerList(vinSid,contractNo);

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

@@ -38,6 +38,7 @@ import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsNewVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
@@ -97,10 +98,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
 
 /**
  * Project: anrui-base(基础信息) <br/>
@@ -238,7 +236,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         baseTrailerDetailsVo.setZcBrandName(baseVehicle.getCarBrandName());
         baseTrailerDetailsVo.setZcModelName(baseVehicle.getModelName());
         BaseVehicleCertificate baseVehicleCertificate = baseVehicleCertificateService.selectByVehicleSid(baseVehicle.getSid());
-        if (baseVehicleCertificate != null){
+        if (baseVehicleCertificate != null) {
             baseTrailerDetailsVo.setZcAnnouncementmodelName(baseVehicleCertificate.getCarModel());
         }
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vehSid).getData();
@@ -284,7 +282,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         ResultBean rb = ResultBean.fireFail();
         String vinNo = dto.getVinNo();
         BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNo(vinNo);
-        if (baseTrailerDetailsVo != null){
+        if (baseTrailerDetailsVo != null) {
             return rb.success().setMsg("该挂车车架号已存在");
         }
         BaseTrailer baseTrailer = new BaseTrailer();
@@ -454,7 +452,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         ResultBean rb = ResultBean.fireFail();
         String vinNo = dto.getVinNo();
         BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndSid(vinNo, sid);
-        if (baseTrailerDetailsVo != null){
+        if (baseTrailerDetailsVo != null) {
             return rb.success().setMsg("该挂车车架号已存在");
         }
         int count = updateBySid(dto, sid);
@@ -544,12 +542,12 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
         FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
-        if (finBillVehicleDetailsVo == null){
+        if (finBillVehicleDetailsVo == null) {
             return rb.setMsg("关联的主车未开票，不可出库");
-        }else {
+        } else {
             String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
             finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
-            if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")){
+            if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
                 return rb.setMsg("关联的主车未开票，不可出库");
             }
         }
@@ -655,14 +653,14 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
         finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
-        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
+        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
             finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
             finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
             finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
             finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
             finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
             finVehicleInvoiceDto.setIsTakeTicket("是");
-        }else {
+        } else {
             CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
             finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
             finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
@@ -746,13 +744,51 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         }
     }
 
-    public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
+    private SalOutStock createSzOrGcSalOutStockNew(BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut, BaseVehicleOutApply baseVehicleOutApply) {
+        SalOutStock salOutStock = new SalOutStock();
+        //单据编号
+        salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
+        //日期
+        salOutStock.setFDate(DateUtil.today());
+        //分公司id
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode());
+        //客户
+        salOutStock.setFCustomerID(baseVehicleOutApply.getContractNo());
+        //销售部门id
+        String orgDeptSid = baseVehicleOutApply.getOrgSid();
+        ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);
+        if (resultBean.getSuccess()) {
+            SysOrganizationVo vo = resultBean.getData();
+            if (vo != null) {
+                salOutStock.setFSaleDeptID(vo.getOrgCode());
+            }
+        }
+        //项目类别key和项目类别type
+        salOutStock.setF_PAEZ_AssistantType("payType");
+        //销售类型-外采挂车映射
+        salOutStock.setF_PAEZ_AssistantKey("009");
+        //物料列表
+        List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
+        SalOutStock.FEntity fEntity = new SalOutStock.FEntity();
+        //单价
+        fEntity.setFPrice(baseVehicleOut.getPrice().toString());
+        //物料编码
+        fEntity.setFMaterialID(baseVehicleOut.getMaterialCode());
+        //仓库id
+        fEntity.setFStockID("ARZSCK");
+        fEntityList.add(fEntity);
+        salOutStock.setFEntity(fEntityList);
+        return salOutStock;
+    }
+
+    public ResultBean<TraliveredVo> trailerList(String vinSid, String contractNo) {
         ResultBean<TraliveredVo> rb = ResultBean.fireFail();
         //查询销售订单的上装价格
         String price = "";
         ResultBean<AppOrderDetailsVo> detailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(contractNo);
-        if(detailsVoResultBean.getData() != null){
+        if (detailsVoResultBean.getData() != null) {
-            if(detailsVoResultBean.getData().getTopInfo() != null){
+            if (detailsVoResultBean.getData().getTopInfo() != null) {
                 price = detailsVoResultBean.getData().getTopInfo().getTopPrice();
             }
         }
@@ -764,23 +800,23 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         traliveredVo.setModelName(baseVehicle.getModelName());
         List<TrailerVo> voList = baseMapper.trailerList(vinSid);
         voList.removeAll(Collections.singleton(null));
-        if(!voList.isEmpty()){
+        if (!voList.isEmpty()) {
             traliveredVo.setList(voList);
         }
         //查询车辆的上装配置
-        List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(baseVehicle.getCreateOrgSid(), baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length()-8));
+        List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(baseVehicle.getCreateOrgSid(), baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
         baseVehinstallsList.removeAll(Collections.singleton(null));
         for (int i = 0; i < baseVehinstallsList.size(); i++) {
             BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = new BaseVehinstallmodelDetailsVo();
             BaseVehinstall baseVehinstall = baseVehinstallsList.get(i);
             String topSid = baseVehinstall.getMainSid();
             BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(topSid);
-            BeanUtil.copyProperties(baseVehinstallmodel,baseVehinstallmodelDetailsVo);
+            BeanUtil.copyProperties(baseVehinstallmodel, baseVehinstallmodelDetailsVo);
             baseVehinstallmodelDetailsVo.setTopPrice(price);
             vehillModelList.add(baseVehinstallmodelDetailsVo);
         }
         vehillModelList.removeAll(Collections.singleton(null));
-        if(!vehillModelList.isEmpty()){
+        if (!vehillModelList.isEmpty()) {
             traliveredVo.setVehillModelList(vehillModelList);
         }
         return rb.success().setData(traliveredVo);
@@ -795,4 +831,112 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public List<BaseTrailerVo> fetchAllByVehSid(String materialSid) {
         return baseMapper.fetchAllByVehSid(materialSid);
     }
+
+    public ResultBean trailerOutNew(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseTrailer baseTrailer = fetchBySid(sid);
+        if (baseTrailer.getStockStateKey().equals("0002")) {
+            return rb.setMsg("该挂车已出库");
+        }
+        String vehSid = baseTrailer.getVehSid();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
+        String vehicleState = baseVehicle.getVehicleState();
+        if (!vehicleState.equals("0002")) {
+            return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
+        }
+        FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
+        FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
+        if (finBillVehicleDetailsVo == null) {
+            return rb.setMsg("关联的主车未开票，不可出库");
+        } else {
+            String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
+            finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
+            if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
+                return rb.setMsg("关联的主车未开票，不可出库");
+            }
+        }
+        //生成单据编号
+        String billNo = "";
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+        billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
+        String i = baseMapper.selectNum(billNo);
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(billNo, 0);
+        }
+        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid);
+        BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOutDetailsVo.getMainSid());
+        //出库主表信息录入
+        baseVehicleOutApply.setSid(UUID.randomUUID().toString());
+        baseVehicleOutApply.setBillNo(billNo);
+        //保存车辆出库单主表
+        baseVehicleOutApplyService.save(baseVehicleOutApply);
+        BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
+        baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid());
+        baseVehicleOut.setZcMGroupCode("99.02");
+        baseVehicleOut.setZcMGroupName("挂车");
+        baseVehicleOut.setVinNo(baseTrailer.getVinNo());
+        baseVehicleOut.setVinSid(vehSid);
+        baseVehicleOut.setPrice(baseTrailer.getDealPrice());
+        //出库单子表关联主表sid
+        baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
+        baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
+        baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
+        baseVehicleOut.setMaterialCode(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
+        baseVehicleOut.setMaterialName("挂车");
+        baseVehicleOut.setMaterialTypeKey("002");
+        baseVehicleOut.setMaterialTypeValue("挂车");
+        baseVehicleOut.setMaterialSid(baseTrailer.getSid());
+        //保存车辆出库单子表
+        baseVehicleOutService.save(baseVehicleOut);
+        //推送金蝶挂车销售出库单
+        SalOutStock salOutStock = createSzOrGcSalOutStockNew(baseVehicle, baseVehicleOut, baseVehicleOutApply);
+        finKingDeeFeign.draftSalOutStock(salOutStock);
+        List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
+        for (SalOutStock.FEntity entity : fEntity) {
+            baseTrailer.setStockStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
+            baseTrailer.setStockStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+            baseTrailer.setDealPrice(baseVehicleOut.getPrice());
+            baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
+            saveOrUpdate(baseTrailer);
+        }
+        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+        finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
+        finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
+        finVehicleInvoiceDto.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
+        finVehicleInvoiceDto.setVehicleSid(baseTrailer.getSid());
+        finVehicleInvoiceDto.setVIN(baseTrailer.getVinNo());
+        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
+        finVehicleInvoiceDto.setInvoiceType(finBillVehicleDetailsVo.getBillTypeValue());
+        finVehicleInvoiceDto.setInvoiceAmount(baseTrailer.getOneBillMoney());
+        finVehicleInvoiceDto.setBillingStateKey("001");
+        finVehicleInvoiceDto.setBillingState("未开票");
+        finVehicleInvoiceDto.setTransferStateKey("001");
+        finVehicleInvoiceDto.setTransferState("未移交");
+        finVehicleInvoiceDto.setVehicleType("挂车");
+        finVehicleInvoiceDto.setBillingSid(finBillApplicationDetailsVo.getSid());
+        finVehicleInvoiceDto.setInvoicingName(finBillVehicleDetailsVo.getOpenTickName());
+        finVehicleInvoiceDto.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
+        finVehicleInvoiceDto.setBusinessStateKey(finBillApplicationDetailsVo.getBillStateKey());
+        finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
+        finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
+        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
+        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+            finVehicleInvoiceDto.setIsTakeTicket("是");
+        } else {
+            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
+            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+            finVehicleInvoiceDto.setIsTakeTicket("是");
+        }
+        finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);
+        return rb.success();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -292,4 +292,9 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     public ResultBean vehinstallOut(String sid) {
         return baseVehinstallService.vehinstallOut(sid);
     }
+
+    @Override
+    public ResultBean vehinstallOutNew(String sid) {
+        return baseVehinstallService.vehinstallOutNew(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -425,4 +425,96 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 			return null;
 		}
 	}
+
+	public ResultBean vehinstallOutNew(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehinstall baseVehinstall = fetchBySid(sid);
+		if (baseVehinstall.getVehicleStateKey().equals("0002")) {
+			return rb.setMsg("该挂车已出库");
+		}
+		BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehinstall.getVinNo(),baseVehinstall.getCreateOrg());
+		String vehicleState = baseVehicle.getVehicleState();
+		if (!vehicleState.equals("0002")) {
+			return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
+		}
+		BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseVehinstall.getCreateOrg(), baseVehicle.getSid());
+		BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
+		BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid");
+		baseVehicleOut.setTypeKey("003");
+		baseVehicleOut.setType("上装挂车");
+		String billNo = "";
+		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+		String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+		billNo = "XSCKD" + basePurchaseSystemDetailsVo.getOrgCode() + date;
+		String i = baseMapper.selectNum(billNo);
+		if (StringUtils.isNotBlank(i)) {
+			billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+		} else {
+			billNo = Rule.getBillNo(billNo, 0);
+		}
+		baseVehicleOut.setBillNo(billNo);
+		baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
+		baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
+		baseVehicleOut.setTrailerOrInstallCode(baseVehinstall.getVinNo().substring(baseVehinstall.getVinNo().length() - 8) + "SZ");
+		baseVehicleOut.setSzOrGCSid(baseVehinstall.getSid());
+		baseVehicleOut.setTrailerOrInstallName("上装");
+		BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstall.getMainSid());
+		String wk_long = baseVehinstallmodel.getWk_long();
+		String wk_wide = baseVehinstallmodel.getWk_wide();
+		String wk_high = baseVehinstallmodel.getWk_high();
+		String installName = baseVehinstallmodel.getInstallNameValue();
+		StringBuilder vehinstallmodel = new StringBuilder();
+		vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
+		baseVehicleOut.setTrailerOrInstall(vehinstallmodel.toString());
+		baseVehicleOut.setTrailerOrInstallDealPrice(baseVehinstall.getGuidePrice());
+		//备注
+		String remarks1 = createRemarks(baseVehicleOut);
+		String remarks2 = baseVehicleOut.getRemarks();
+		String remarks3 = remarks2 + remarks1;
+		if ("null".equals(remarks3)) {
+			remarks3 = "";
+		}
+		baseVehicleOut.setRemarks(remarks3);
+		BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply();
+		baseVehicleOutApply.setBillNo(billNo);
+		baseVehicleOutApply.setSaleDate(baseVehicleOut.getSaleDate());
+		baseVehicleOutApply.setCustomerSid(baseVehicleOut.getCustomerSid());
+		baseVehicleOutApply.setCustomerName(baseVehicleOut.getCustomerName());
+		baseVehicleOutApply.setMobile(baseVehicleOut.getMobile());
+		baseVehicleOutApply.setOrgSid(baseVehicleOut.getOrgSid());
+		baseVehicleOutApply.setOrgName(baseVehicleOut.getOrgName());
+		baseVehicleOutApply.setStaffSid(baseVehicleOut.getStaffSid());
+		baseVehicleOutApply.setStaffName(baseVehicleOut.getStaffName());
+		baseVehicleOutApply.setMakeListSid(baseVehicleOut.getCreateBySid());
+		baseVehicleOutApply.setMakeListName(baseVehicleOut.getCreateByName());
+		baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
+		baseVehicleOutApply.setSaleTypeKey(baseVehicleOut.getTypeKey());
+		baseVehicleOutApply.setSaleTypeValue(baseVehicleOut.getType());
+		baseVehicleOutApply.setCreateOrgSid(baseVehicleOut.getCreateOrgSid());
+		baseVehicleOutApply.setCreateBySid(baseVehicleOut.getCreateBySid());
+		//保存车辆出库单主表
+		baseVehicleOutApplyService.save(baseVehicleOutApply);
+		//出库单子表关联主表sid
+		baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
+		baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
+		baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
+		baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
+		baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
+		//保存车辆出库单子表
+		baseVehicleOutService.save(baseVehicleOut);
+		//推送金蝶上装销售出库单
+		SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehinstall, baseVehicle, baseVehicleOut);
+		finKingDeeFeign.draftSalOutStock(salOutStock);
+		List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
+		for (SalOutStock.FEntity entity : fEntity) {
+			String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
+			if ("Z".equals(substring)) {
+				baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
+				baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+				baseVehinstall.setSalesDate(DateUtil.formatDate(new Date()));
+				saveOrUpdate(baseVehinstall);
+			}
+		}
+		return rb.success();
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -65,7 +65,7 @@ public interface FinCompanyInvoicingFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody FinCompanyInvoicingDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySidsPath/{sid}")
     public ResultBean delBySidsPath(@PathVariable("sid") String sid);
@@ -74,7 +74,7 @@ public interface FinCompanyInvoicingFeign {
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -88,12 +88,12 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("根据分公司和采购系统查询")
     @GetMapping("/getDetailsByUseOrgAndSystem")
     @ResponseBody
-    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid")String useOrgSid,@RequestParam("systemSid")String systemSid);
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("systemSid") String systemSid);
 
     @ApiOperation("根据分公司查询开票信息")
     @GetMapping("/selectInvoingList")
     @ResponseBody
-    ResultBean<List<InvoicingVo>> selectInvoingList(@RequestParam("busSid")String busSid);
+    ResultBean<List<InvoicingVo>> selectInvoingList(@RequestParam("busSid") String busSid);
 
     /*************************************************企业开票信息管理***************************************************/
 
@@ -104,7 +104,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据名称模糊检索")
     @PostMapping("/qyFetchListByName")
     @ResponseBody
-    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name,@RequestParam("useOrgSid") String useOrgSid);
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name, @RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("企业开票信息管理新增或保存")
     @PostMapping("/qySaveOrUpdate")
@@ -119,5 +119,10 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
     @ResponseBody
-    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search);
+    List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search);
+
+    @ApiOperation("企业开票信息管理移动端维护初始化")
+    @GetMapping("/qyAppFetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -114,4 +114,9 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return null;
     }
+
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
+        return null;
+    }
 }

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

@@ -3073,20 +3073,114 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
-            //极光推送
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-            finBillApplication = fetchBySid(businessSid);
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
-            ufVo.setProcDefId(finBillApplication.getProcDefId());
+                    if (count == 0) {
-            ufVo.setProcInsId(finBillApplication.getProcInstSid());
+                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-            messageFlowableQuery.setUfVo(messageFlowVo);
+                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
-            messageFlowableQuery.setAppMap(appMap);
+                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
-            messageFlowableQuery.setBusinessSid(businessSid);
+                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
-            messageFlowableQuery.setModuleName("开票申请");
+                        finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
-            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
-            messageFlowableQuery.setMsgTitle("开票申请");
+                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
-            messageFeign.pushMessage(messageFlowableQuery);
+                        finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                        finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                        finVehicleInvoiceDto.setBillingStateKey("001");
+                        finVehicleInvoiceDto.setBillingState("未开票");
+                        finVehicleInvoiceDto.setTransferStateKey("001");
+                        finVehicleInvoiceDto.setTransferState("未移交");
+                        finVehicleInvoiceDto.setVehicleType("主车");
+                        finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                        finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
+                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
+                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }else {
+                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }
+                        finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                    }
+                }
+                if (finBillTrailerVos != null) {
+                    for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                        String gcVinNo = finBillTrailerVo.getGcVinNo();
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
+                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
+                        if (count == 0) {
+                            FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                            finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                            finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                            finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                            finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
+                            finVehicleInvoiceDto.setVIN(gcVinNo);
+                            finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                            finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                            finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
+                            finVehicleInvoiceDto.setBillingStateKey("001");
+                            finVehicleInvoiceDto.setBillingState("未开票");
+                            finVehicleInvoiceDto.setTransferStateKey("001");
+                            finVehicleInvoiceDto.setTransferState("未移交");
+                            finVehicleInvoiceDto.setVehicleType("挂车");
+                            finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
+                            finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
+                            finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                            finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                            finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                            finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
+                            if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
+                                finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+                                finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+                                finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+                                finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }else {
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }
+                            finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                        }
+                    }
+                }
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+                BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+                if (oneBillMoney == null) {
+                    busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
+                }
+            } else {
+                //极光推送
+                finBillApplication = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                ufVo.setProcDefId(finBillApplication.getProcDefId());
+                ufVo.setProcInsId(finBillApplication.getProcInstSid());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("开票申请");
+                messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("开票申请");
+                messageFeign.pushMessage(messageFlowableQuery);
+            }
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -145,4 +145,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
 		return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid,search);
 	}
+
+	@Override
+	public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
+		return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -75,6 +77,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
     private BusSalesOrderFeign busSalesOrderFeign;
     @Resource
     private SysUserFeign sysUserFeign;
+    @Resource
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     private QueryWrapper<FinCompanyInvoicing> createQueryWrapper(FinCompanyInvoicingQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -252,7 +256,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
         //移动端查询条件
-        if (StringUtils.isNotBlank(query.getAppName())){
+        if (StringUtils.isNotBlank(query.getAppName())) {
             qw.and(wrapper -> wrapper.like("fci.name", query.getAppName()).or().like("fci.taxpayerNo", query.getAppName()));
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
@@ -265,7 +269,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         String useOrgSid = dto.getUseOrgSid();
-        if (StringUtils.isBlank(useOrgSid)){
+        if (StringUtils.isBlank(useOrgSid)) {
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()).getData();
             dto.setUseOrgSid(useOrgSid);
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -353,7 +357,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return rb.success().setData(finAppDisAndCustm);
     }
 
-    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name,String useOrgSid) {
+    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name, String useOrgSid) {
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
@@ -374,7 +378,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.like("name",search);
+        qw.like("name", search);
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -382,4 +386,18 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
     public void delBySidsPath(String sid) {
         deleteBySid(sid);
     }
+
+    public ResultBean<FinCompanyInvoicingDetailsVo> qyAppFetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid);
+        if (finCompanyInvoicingDetailsVo != null) {
+            return rb.success().setData(finCompanyInvoicingDetailsVo);
+        }
+        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData();
+        finCompanyInvoicingDetailsVo.setSid(crmCustomerTempVo.getSid());
+        finCompanyInvoicingDetailsVo.setName(crmCustomerTempVo.getName());
+        finCompanyInvoicingDetailsVo.setPhone(crmCustomerTempVo.getMobile());
+        finCompanyInvoicingDetailsVo.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+        return rb.success().setData(finCompanyInvoicingDetailsVo);
+    }
 }