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

销售台账问题调整

master
God 2 years ago
parent
e58c163a74
commit
20e3e7b0fb
1 changed files with 41 additions and 19 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. 60
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

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

@ -907,10 +907,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
private SalOutStock createZSSalOutStock(BaseVehicle baseVehicle, BaseVehicleOut dto, BaseVehicleOutApply appDto) {
private SalOutStock createZSSalOutStock(BaseVehicle baseVehicle, BaseVehicleOut dto, BaseVehicleOutApply appDto, String temporaryNumZc) {
SalOutStock salOutStock = new SalOutStock();
//单据编号
salOutStock.setFBillNo(appDto.getBillNo());
if ("00".equals(temporaryNumZc)) {
salOutStock.setFBillNo(appDto.getBillNo());
} else {
salOutStock.setFBillNo(appDto.getBillNo() + "-" + temporaryNumZc);
}
//日期
salOutStock.setFDate(appDto.getSaleDate());
//分公司id
@ -1513,7 +1517,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
if ("001".equals(payTypeKey)) {//全款
baseVehicleZSOutDto.setCwCustomerNo(baseVehicleZSOutApplyDto.getContractNo());
}else {//贷款
} else {//贷款
baseVehicleZSOutDto.setCwCustomerNo(bdCustomer.getFNumber());
}
gcOrSzDtos.add(baseVehicleZSOutDto);
@ -1531,7 +1535,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleZSOutDto.setVinSid(dto.getVinSid());
if ("001".equals(payTypeKey)) {//全款
baseVehicleZSOutDto.setCwCustomerNo(baseVehicleZSOutApplyDto.getContractNo());
}else {//贷款
} else {//贷款
baseVehicleZSOutDto.setCwCustomerNo(bdCustomer.getFNumber());
}
gcOrSzDtos.add(baseVehicleZSOutDto);
@ -1574,7 +1578,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setCreateBySid(baseVehicleOutApply.getCreateBySid());
if ("001".equals(payTypeKey)) {//全款
baseVehicleOut.setCwCustomerNo(baseVehicleZSOutApplyDto.getContractNo());
}else {//贷款
} else {//贷款
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
}
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
@ -1593,14 +1597,21 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicle1.setSalePrice(Integer.valueOf(dto.getPrice()));
}
baseVehicleService.updateById(baseVehicle1);
int j = 0;
if (!"001".equals(payTypeKey)) {//贷款
try {
if (j != 0) {
j = j + 1;
}
String temporaryNumZc = String.format("%02d", j);
//推送主车销售出库单
SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply);
SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply, temporaryNumZc);
finKingDeeFeign.draftSalOutStock(salOutStock);
j = j + 1;
String temporaryNumGcOrSz = String.format("%02d", j);
//推送主车对应的上装或挂车销售出库单
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumGcOrSz);
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
}
} catch (Exception e) {
@ -1613,9 +1624,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//推送所有主车销售出库单
SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
finKingDeeFeign.draftSalOutStock(salOutStock);
int x = 1;
String temporaryNumZc = String.format("%02d", x);
//推送所有上装或挂车销售出库单
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
}
}
@ -1687,10 +1700,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
return rb.success();
}
private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply) {
private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) {
SalOutStock salOutStock = new SalOutStock();
//单据编号
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-1");
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
//日期
salOutStock.setFDate(DateUtil.today());
//分公司id
@ -2001,7 +2014,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
dataMap.put("tPriceDX", tPriceDX);
//获取审批记录
AppDeliveredDetailsVo appDeliveredDetailsVo = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(baseVehicleOutApply.getBusSid()).getData();
if (appDeliveredDetailsVo == null){
if (appDeliveredDetailsVo == null) {
return null;
}
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(appDeliveredDetailsVo.getProcInstId(), "1").getData();
@ -2012,12 +2025,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String finishTime = (String) flowableRecordVo.get("finishTime");
finishTime = finishTime.substring(0,10);
if ("Activity_1x1eivz".equals(taskDefKey)){
finishTime = finishTime.substring(0, 10);
if ("Activity_1x1eivz".equals(taskDefKey)) {
dataMap.put("makeName", assigneeName + finishTime);
}else if ("Activity_13w5v5m".equals(taskDefKey)){
} else if ("Activity_13w5v5m".equals(taskDefKey)) {
dataMap.put("jrsp", assigneeName + finishTime);
}else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)){
} else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)) {
dataMap.put("confirmName", assigneeName + finishTime);
}
}
@ -2073,26 +2086,35 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//推送所有主车销售出库单
SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
finKingDeeFeign.draftSalOutStock(salOutStock);
int x = 1;
String temporaryNumZc = String.format("%02d", x);
//推送所有上装或挂车销售出库单
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
}
} else {//贷款
List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
int j = 0;
for (BaseVehicleOut vehicleOut : zcDtosDK) {
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
//推送主车销售出库单
SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply);
if (j != 0) {
j = j + 1;
}
String temporaryNumZc = String.format("%02d", j);
SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply, temporaryNumZc);
finKingDeeFeign.draftSalOutStock(salOutStock);
j = j + 1;
String temporaryNumGcOrSz = String.format("%02d", j);
for (BaseVehicleZSOutDto gcOrSzDto : gcOrSzDtos) {
if (gcOrSzDto.getVinSid().equals(vehicleOut.getVinSid())){
if (gcOrSzDto.getVinSid().equals(vehicleOut.getVinSid())) {
gcOrSzDtosDK.add(gcOrSzDto);
}
}
//推送主车对应的上装或挂车销售出库单
if (gcOrSzDtosDK.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply);
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
}
}

Write Preview
Loading…
Cancel
Save