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

问题修改

master
God 2 years ago
parent
706652bcc0
commit
2996a0e29e
1 changed files with 21 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

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

@ -109,6 +109,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
String payTypeKey = dto.getTypeKey(); String payTypeKey = dto.getTypeKey();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid); BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
List<BdCustomer> bdCustomers = new ArrayList<>();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
//bdCustomer.setTOrgIds(data.getOrgCode());
//判断车辆是否存在流程中的销售订单 //判断车辆是否存在流程中的销售订单
/*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData(); /*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vinSid).getData();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
@ -122,22 +126,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//出库类型是否为全款车（001全款） //出库类型是否为全款车（001全款）
if ("001".equals(payTypeKey)) { if ("001".equals(payTypeKey)) {
Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); Boolean aBoolean = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
bdCustomer.setFNumber(dto.getCustomerNo());
if (!aBoolean) { if (!aBoolean) {
List<BdCustomer> bdCustomers = new ArrayList<>(); //List<BdCustomer> bdCustomers = new ArrayList<>();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode());
} else {
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
}
bdCustomer.setFName(dto.getCustomerName() + dto.getMobile()); bdCustomer.setFName(dto.getCustomerName() + dto.getMobile());
bdCustomer.setFNumber(dto.getCustomerNo());
//bdCustomer.setFShortName(dto.getConcatNo()); //bdCustomer.setFShortName(dto.getConcatNo());
bdCustomers.add(bdCustomer); //bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers); //finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber()); //dto.setCwCustomerNo(bdCustomer.getFNumber());
} else {
dto.setCwCustomerNo(dto.getCustomerNo());
} }
} else { } else {
String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
@ -157,13 +153,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
if (!aBoolean1) { if (!aBoolean1) {
Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
if (!aBoolean2) { if (!aBoolean2) {
List<BdCustomer> bdCustomers = new ArrayList<>();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode());
} else {
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
}
bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
if (FNumber1.length() > 30) { if (FNumber1.length() > 30) {
@ -173,9 +162,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
bdCustomer.setFNumber(FNumber1); bdCustomer.setFNumber(FNumber1);
} }
bdCustomer.setFShortName(dto.getConcatNo()); bdCustomer.setFShortName(dto.getConcatNo());
bdCustomers.add(bdCustomer); //bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers); //finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber()); //dto.setCwCustomerNo(bdCustomer.getFNumber());
} else { } else {
b = true; b = true;
return rb.success().setData(b); return rb.success().setData(b);
@ -190,13 +179,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
} else { } else {
Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
if (!aBoolean1) { if (!aBoolean1) {
List<BdCustomer> bdCustomers = new ArrayList<>();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode());
} else {
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
}
bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
if (FNumber1.length() > 30) { if (FNumber1.length() > 30) {
@ -206,29 +188,21 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
bdCustomer.setFNumber(FNumber1); bdCustomer.setFNumber(FNumber1);
} }
bdCustomer.setFShortName(dto.getConcatNo()); bdCustomer.setFShortName(dto.getConcatNo());
bdCustomers.add(bdCustomer); //bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers); //finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber()); //dto.setCwCustomerNo(bdCustomer.getFNumber());
} else { } else {
b = true; b = true;
return rb.success().setData(b); return rb.success().setData(b);
} }
} }
} else {
dto.setCwCustomerNo(FNumber);
} }
//修改客户简称为合同编号 //修改客户简称为合同编号
List<BdCustomer> bdCustomers = new ArrayList<>(); //List<BdCustomer> bdCustomers = new ArrayList<>();
bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
bdCustomer.setFShortName(dto.getConcatNo()); bdCustomer.setFShortName(dto.getConcatNo());
bdCustomer.setFNumber(FNumber); bdCustomer.setFNumber(FNumber);
bdCustomer.setOldFNumber(FNumber); bdCustomer.setOldFNumber(FNumber);
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode());
} else {
bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
}
bdCustomers.add(bdCustomer); bdCustomers.add(bdCustomer);
finKingDeeFeign.saveBdCustomers(bdCustomers); finKingDeeFeign.saveBdCustomers(bdCustomers);
} }
@ -343,6 +317,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
if (StringUtils.isNotBlank(bdCustomer.getFNumber())) { if (StringUtils.isNotBlank(bdCustomer.getFNumber())) {
dto.setCustomerNo(bdCustomer.getFNumber()); dto.setCustomerNo(bdCustomer.getFNumber());
} }
bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber());
SalOutStock salOutStock = createSalOutStock(baseVehicle, dto); SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock)); log.info("BaseVehicleOutService-vehicleOut-287:{}", JSONObject.toJSONString(salOutStock));
finKingDeeFeign.draftSalOutStock(salOutStock); finKingDeeFeign.draftSalOutStock(salOutStock);
@ -354,14 +331,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
bdEmpinfo.setFName(dto.getStaffName()); bdEmpinfo.setFName(dto.getStaffName());
bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber()); bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress()); bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdEmpinfo.setFCreateOrgId(data.getOrgCode()); bdEmpinfo.setFCreateOrgId(data.getOrgCode());
bdEmpinfo.setFUseOrgId(data.getOrgCode()); bdEmpinfo.setFUseOrgId(data.getOrgCode());
} else {
bdEmpinfo.setFCreateOrgId(sysOrganizationVo.getOrgCode());
bdEmpinfo.setFUseOrgId(sysOrganizationVo.getOrgCode());
}
bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile()); bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
finKingDeeFeign.saveBDEmpinfo(bdEmpinfo); finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
} catch (Exception e) { } catch (Exception e) {

Write Preview
Loading…
Cancel
Save