yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
bfefb52093 556433ea40
commit
6452698b26
1 changed files with 49 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

51
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -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<BusSa
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
@Autowired
private BaseVehicleOutFeign baseVehicleOutFeign;
@ -739,6 +746,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
//退车后修改金蝶客户信息
updateFinCustomerInfo(vehicleList);
}
//判断销售订单是否全部退车
List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid);
@ -759,9 +768,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
salesOrder.setNodeState("作废");
busSalesOrderService.updateById(salesOrder);
if(!stringList.isEmpty()){
if (!stringList.isEmpty()) {
for (int j = 0; j < stringList.size(); j++) {
if(StringUtils.isNotBlank(stringList.get(j))){
if (StringUtils.isNotBlank(stringList.get(j))) {
baseMapper.updateByBorrowSid(stringList.get(j));
}
}
@ -788,6 +797,44 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
}
public void updateFinCustomerInfo(List<BusSalesOrderVehicle> 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<BdCustomer> 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);
}
}
}
}
}
/**
* 获取上一环节
*

Write Preview
Loading…
Cancel
Save