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

修改结算

master
fanzongzhe 5 months ago
parent
9ff4f648ac
commit
70adf3987d
2 changed files with 34 additions and 253 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. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
  2. 284
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
View File

@ -123,8 +123,9 @@ public class AsBusrepairBillRest {
@PostMapping("/settle")
@ResponseBody
@ApiOperation("结算")
ResultBean<String> settle(@RequestBody AsBusrepairBillDto dto) {
ResultBean settle(@RequestBody AsBusrepairBillDto dto) {
return asBusrepairBillService.settle(dto);
}

284
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
View File

@ -204,9 +204,9 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
asTrackBillDto.setWaitorSid(asBusrepairBill.getWaitorSid());
asTrackBillDto.setWaitorName(asBusrepairBill.getWaitorName());
Calendar calendar = Calendar.getInstance();
if (StringUtils.isNotBlank(asBusrepairBill.getSettleTime())){
if (StringUtils.isNotBlank(asBusrepairBill.getSettleTime())) {
calendar.setTime(DateUtil.parseDate(asBusrepairBill.getSettleTime()));
}else {
} else {
calendar.setTime(new Date());
}
calendar.add(Calendar.DAY_OF_MONTH, 3);
@ -411,7 +411,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
invoice.setTaxItems(sb.toString());
}
}
} else {
} else {
invoice.setTaxItems(null);
}
} else {
@ -1484,236 +1484,16 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
return rb.success();
}
public ResultBean<String> settle(AsBusrepairBillDto dto) {
public ResultBean settle(AsBusrepairBillDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
AsBusrepairBill asBusrepairBill = fetchBySid(sid);
if (asBusrepairBill.getNodeCode() == 5) {
// //计算工时提成分配维修人员
// List<AsBusrepairBillSitem> sitems = asBusrepairBillSitemService.fetchByBillSid(sid);
// if (sitems != null) {
// if (!sitems.isEmpty()) {
// for (AsBusrepairBillSitem sitem : sitems) {
// BigDecimal examineHourPrice = BigDecimal.ZERO;
// if (null != sitem.getExamineHourPrice()) {
// examineHourPrice = sitem.getExamineHourPrice();
// }
// if (examineHourPrice.compareTo(BigDecimal.ZERO) > 0) {
// String billSid = sitem.getBillSid();
// String serviceItemSid = sitem.getServiceItemSid();
// List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(billSid, serviceItemSid);
// if (null != repairers) {
// if (!repairers.isEmpty()) {
// //查询权重之和
// BigDecimal sum = BigDecimal.ZERO;
// Map<String, BigDecimal> map = new HashMap<>();
// for (AsBusrepairBillSitemRepairer repairer : repairers) {
// String rSid = repairer.getSid();
// String pSid = repairer.getRepairerSid();
// BigDecimal weight = BigDecimal.ZERO;
// String w = asTechTitleDetailService.selWeightByUserSid(pSid);
// if (StringUtils.isNotBlank(w)) {
// weight = new BigDecimal(w);
// }
// sum = sum.add(weight);
// map.put(rSid, weight);
// }
// if (sum.compareTo(BigDecimal.ZERO) > 0) {
// if (map.size() > 0) {
// for (Map.Entry<String, BigDecimal> entry : map.entrySet()) {
// String mSid = entry.getKey();
// BigDecimal mWeight = entry.getValue();
// AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchBySid(mSid);
// BigDecimal finalWeight = mWeight.divide(sum, 2, BigDecimal.ROUND_HALF_UP).multiply(examineHourPrice);
// repairer.setCommission(finalWeight);
// asBusrepairBillSitemRepairerService.updateById(repairer);
// }
// }
// }
// }
// }
// }
// }
// }
// }
if (asBusrepairBill.getSubject().equals("保内")) {
if (asBusrepairBill.getOldIsReclaim() != 1) {
return rb.setMsg("请先完成旧件入库，再进行操作！");
}
// asBusrepairBill.setNodeCode(6);
// asBusrepairBill.setNodeName("已结算");
// asBusrepairBill.setNodeTime(new DateTime());
// asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
// if (asBusrepairBill.getMaterialConfirm().intValue() == 0) {
// asBusrepairBill.setMaterialConfirm(1);
// asBusrepairBill.setOutDoorState("2");
// }
// baseMapper.updateById(asBusrepairBill);
// //新增工单环节信息
// AsBusrepairBillNode billNode = new AsBusrepairBillNode();
// billNode.setBillSid(sid);
// billNode.setCreateByName(dto.getOperator());
// billNode.setNodeName("已结算");
// billNode.setCreateBySid(dto.getOperatorSid());
// billNode.setNodeCode("6");
// asBusrepairBillNodeService.insert(billNode);
}
// if (asBusrepairBill.getSubject().equals("保外")) {
// SettleVo settleVo = dto.getSettleVo();
// if (null != settleVo) {
// FmsReceivesettleDto settleDto = new FmsReceivesettleDto();
// BeanUtil.copyProperties(settleVo, settleDto, "id", "sid");
// settleDto.setCreateBySid(dto.getOperatorSid());
// settleDto.setCreateByName(dto.getOperator());
// settleDto.setSourceBillSid(dto.getSid());
// settleDto.setSourceBillNo(asBusrepairBill.getBillNo());
// fmsReceivesettleFeign.save(settleDto);
// if (null != asBusrepairBill.getHourAmount()) {
// if (asBusrepairBill.getHourAmount().compareTo(BigDecimal.ZERO) > 0) {
// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
// if (null != billVech) {
// if (StringUtils.isNotBlank(billVech.getVinNo())) {
// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo());
// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
// }
// }
// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
// finUncollectedReceivablesDetailedDto.setReceivablesName("工时费");
// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getHourAmount()).toString());
// finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getHourAmount()).toString());
// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
// finUncollectedReceivablesDetailedDto.setKxState("01");
// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
// }
// }
// if (null != asBusrepairBill.getGoodsAmount()) {
// if (asBusrepairBill.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) {
// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
// if (null != billVech) {
// if (StringUtils.isNotBlank(billVech.getVinNo())) {
// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo());
// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
// }
// }
// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
// finUncollectedReceivablesDetailedDto.setReceivablesName("材料费");
// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getGoodsAmount()).toString());
// finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getGoodsAmount()).toString());
// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
// finUncollectedReceivablesDetailedDto.setKxState("01");
// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
// }
// }
// BigDecimal addAmount = BigDecimal.ZERO;
// BigDecimal outAmount = BigDecimal.ZERO;
// BigDecimal subsidyAmount = BigDecimal.ZERO;
// BigDecimal rescueAmount = BigDecimal.ZERO;
// if (null != asBusrepairBill.getAddAmount()) {
// addAmount = asBusrepairBill.getAddAmount();
// }
// if (null != asBusrepairBill.getOutAmount()) {
// outAmount = asBusrepairBill.getOutAmount();
// }
// if (null != asBusrepairBill.getSubsidyAmount()) {
// subsidyAmount = asBusrepairBill.getSubsidyAmount();
// }
// if (null != asBusrepairBill.getRescueAmount()) {
// rescueAmount = asBusrepairBill.getRescueAmount();
// }
// BigDecimal otherAmountAll = addAmount.add(outAmount).add(subsidyAmount).add(rescueAmount);
// if (otherAmountAll.compareTo(BigDecimal.ZERO) > 0) {
// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid());
// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName());
// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid());
// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo());
// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid());
// if (null != billVech) {
// if (StringUtils.isNotBlank(billVech.getVinNo())) {
// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo());
// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid());
// }
// }
// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid());
// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName());
// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile());
// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
// finUncollectedReceivablesDetailedDto.setReceivablesName("其他费用");
// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(otherAmountAll.toString());
// finUncollectedReceivablesDetailedDto.setReveivableMoney(otherAmountAll.toString());
// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
// finUncollectedReceivablesDetailedDto.setKxState("01");
// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
// }
// }
// asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
// asBusrepairBill.setNodeCode(6);
// asBusrepairBill.setNodeName("已结算");
// asBusrepairBill.setNodeTime(new DateTime());
// asBusrepairBill.setOutDoorState("2");
// baseMapper.updateById(asBusrepairBill);
// //保外推送结算申请
// AsBillSettelApplyDto settelApplyDto = new AsBillSettelApplyDto();
// settelApplyDto.setNodeState("待提交");
// settelApplyDto.setSourceBillType(0);
// settelApplyDto.setCreateByName(dto.getCreateByName());
// settelApplyDto.setCreateTime(new Date());
// settelApplyDto.setCreateBySid(dto.getCreateBySid());
// settelApplyDto.setUseOrgSid(dto.getUseOrgSid());
// settelApplyDto.setDept(dto.getDeptName());
// settelApplyDto.setDeptSid(dto.getDeptSid());
// settelApplyDto.setSourceSid(dto.getSid());
// settelApplyDto.setSourceBillNo(dto.getBillNo());
// settelApplyDto.setCustomerSid(dto.getCustomerSid());
// settelApplyDto.setCustomerName(dto.getCustomerName());
// BigDecimal receivableAmount = BigDecimal.ZERO; // 应收金额
// BigDecimal discountAmount = BigDecimal.ZERO; // 优惠金额
// BigDecimal settleAmount = BigDecimal.ZERO; // 结算金额
// if (StringUtils.isNotBlank(dto.getReceivableAmount())) {
// receivableAmount = new BigDecimal(dto.getReceivableAmount());
// }
// if (StringUtils.isNotBlank(dto.getDiscountAmount())) {
// discountAmount = new BigDecimal(dto.getDiscountAmount());
// }
// settleAmount = receivableAmount.subtract(discountAmount);
// settelApplyDto.setReceivableAmount(receivableAmount.toString());
// settelApplyDto.setSettleAmount(settleAmount.toString());
// asBillSettelApplyService.saveOrUpdateDto(settelApplyDto);
// //新增工单环节信息
// AsBusrepairBillNode billNode = new AsBusrepairBillNode();
// billNode.setBillSid(sid);
// billNode.setCreateByName(dto.getOperator());
// billNode.setNodeName("已结算");
// billNode.setCreateBySid(dto.getOperatorSid());
// billNode.setNodeCode("6");
// asBusrepairBillNodeService.insert(billNode);
// }
}
}
return rb.success();
}
@ -2780,63 +2560,63 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
return p;
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("m.billNo",query.getBillNo());
qw.like("m.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getBillState())) {
qw.eq("m.billState",query.getBillState());
qw.eq("m.billState", query.getBillState());
}
if (StringUtils.isNotBlank(query.getBillType())) {
qw.eq("m.billType",query.getBillType());
qw.eq("m.billType", query.getBillType());
}
//开单开始时间
qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("m.customerName",query.getCustomerName());
qw.like("m.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("m.deptName",query.getDeptName());
qw.like("m.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("m.goodsSkuCode",query.getGoodsSkuCode());
qw.like("m.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("m.manufacturerName",query.getManufacturerName());
qw.like("m.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("m.name",query.getName());
qw.like("m.name", query.getName());
}
if (StringUtils.isNotBlank(query.getPrice())) {
qw.like("m.price",query.getPrice());
qw.like("m.price", query.getPrice());
}
if (StringUtils.isNotBlank(query.getRepairerName())) {
qw.like("m.repairerName",query.getRepairerName());
qw.like("m.repairerName", query.getRepairerName());
}
if (StringUtils.isNotBlank(query.getServiceType())) {
qw.like("m.serviceType",query.getServiceType());
qw.like("m.serviceType", query.getServiceType());
}
//结算时间
qw.apply(StringUtils.isNotBlank(query.getSettleStartTime()), "date_format (m.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleStartTime() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getSettleEndTime()), "date_format (m.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleEndTime() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getSubject())) {
qw.like("m.subject",query.getSubject());
qw.like("m.subject", query.getSubject());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("m.supplierName",query.getSupplierName());
qw.like("m.supplierName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("m.useOrgName",query.getUseOrgName());
qw.like("m.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("m.vehMark",query.getVehMark());
qw.like("m.vehMark", query.getVehMark());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("m.vinNo",query.getVinNo());
qw.like("m.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getWaitorName())) {
qw.like("m.waitorName",query.getWaitorName());
qw.like("m.waitorName", query.getWaitorName());
}
IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pq);
IPage<BusDetailsVo> pagging = baseMapper.busDetailsList(page, qw);
@ -3086,31 +2866,31 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
}
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("m.billNo",query.getBillNo());
qw.like("m.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getBusType())) {
qw.like("m.busType",query.getBusType());
qw.like("m.busType", query.getBusType());
}
if (StringUtils.isNotBlank(query.getBillType())) {
qw.like("m.billType",query.getBillType());
qw.like("m.billType", query.getBillType());
}
if (StringUtils.isNotBlank(query.getSubject())) {
qw.like("m.subject",query.getSubject());
qw.like("m.subject", query.getSubject());
}
if (StringUtils.isNotBlank(query.getCustomer())) {
qw.like("m.customerName",query.getCustomer());
qw.like("m.customerName", query.getCustomer());
}
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("m.vehMark",query.getVehMark());
qw.like("m.vehMark", query.getVehMark());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("m.vinNo",query.getVinNo());
qw.like("m.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getDockingPeople())) {
qw.like("m.dockingPeople",query.getDockingPeople());
qw.like("m.dockingPeople", query.getDockingPeople());
}
if (StringUtils.isNotBlank(query.getWaitorName())) {
qw.like("m.waitorName",query.getWaitorName());
qw.like("m.waitorName", query.getWaitorName());
}
//结算时间
qw.apply(StringUtils.isNotBlank(query.getSettleStartTime()), "date_format (m.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleStartTime() + "','%Y-%m-%d')").
@ -3146,7 +2926,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
public ResultBean<String> updateManuReportNo(String sid, String manuReportNo, String reportFirstDate) {
ResultBean rb = ResultBean.fireFail();
baseMapper.updateManuReportNo(sid,manuReportNo,reportFirstDate);
baseMapper.updateManuReportNo(sid, manuReportNo, reportFirstDate);
return rb.success();
}
}

Write Preview
Loading…
Cancel
Save