From f7e45c000bbcb0fc91b0f875162ec3b67bea845c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 5 Mar 2024 17:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=BD=A6=E9=80=9A=E8=BF=87=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E8=9D=B6=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderReturnVehApplyService.java | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 608d2c61f9..3afe34af48 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; @@ -48,6 +49,8 @@ import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*; import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; @@ -65,6 +68,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDeta import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders; import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; +import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService; import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.bussalesreturnorders.BusSalesReturnOrdersService; @@ -77,6 +81,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -167,6 +172,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid); @@ -759,9 +768,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService vehicleList) { + for (BusSalesOrderVehicle v : vehicleList) { + BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(v.getSalesOrderSid()); + if (null != salesOrder) { + if (salesOrder.getPayTypeKey().equals("2")) { + //判断财务系统是否有客户 + Boolean aBoolean = finKingDeeFeign.customerExistState(v.getTemporaryNo()).getData(); + String linkNo = ""; + BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerService.fetchDetailsVoBySid(v.getBorrowerSid()); + if (aBoolean) { + List bdCustomers = new ArrayList<>(); + BdCustomer bdCustomer = new BdCustomer(); + if (StringUtils.isNotBlank(v.getLinkNo())) { + String vinNo = v.getLinkNo(); + if (vinNo.length() > 8) { + linkNo = vinNo.substring(vinNo.length() - 8); + } else { + linkNo = v.getLinkNo(); + } + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo + "T"); + } + } else { + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + v.getTemporaryNo() + "T"); + } + } + bdCustomer.setFShortName(salesOrder.getContractNo()); + bdCustomer.setFNumber(v.getTemporaryNo()); + bdCustomer.setOldFNumber(v.getTemporaryNo()); + bdCustomers.add(bdCustomer); + finKingDeeFeign.saveBdCustomers(bdCustomers); + } + } + } + } + } + /** * 获取上一环节 *