|
@@ -44,6 +44,10 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
|
|
@Autowired
|
|
@Autowired
|
|
private IWarehouseInOutInfoService warehouseInOutInfoService;
|
|
private IWarehouseInOutInfoService warehouseInOutInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private ISalePlanInfoService salePlanInfoService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISalesClosingReportService salesClosingReportService;
|
|
|
|
+ @Autowired
|
|
private IWorkflowService workflowService;
|
|
private IWorkflowService workflowService;
|
|
@Autowired
|
|
@Autowired
|
|
private GeTuiUtils geTuiUtils;
|
|
private GeTuiUtils geTuiUtils;
|
|
@@ -153,6 +157,21 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
|
|
transactionRecord.setTurnover(saleOrder.getTransactionsNumber());
|
|
transactionRecord.setTurnover(saleOrder.getTransactionsNumber());
|
|
boolean two = transactionRecordService.insert(transactionRecord);
|
|
boolean two = transactionRecordService.insert(transactionRecord);
|
|
geTuiUtils.pushByCid("平仓通知","您的合同:" + saleOrder.getContractNo() + " 平仓成功",saleOrder.getCommonId());
|
|
geTuiUtils.pushByCid("平仓通知","您的合同:" + saleOrder.getContractNo() + " 平仓成功",saleOrder.getCommonId());
|
|
|
|
+ // 平仓报表
|
|
|
|
+ // 查询计划
|
|
|
|
+ SalePlanInfo salePlanInfo = salePlanInfoService.selectById(saleOrder.getPlanId());
|
|
|
|
+ SalesClosingReport salesClosingReport = new SalesClosingReport();
|
|
|
|
+ salesClosingReport.setId(IdGenerator.generateUUID());
|
|
|
|
+ salesClosingReport.setCompId(saleOrder.getCompId());
|
|
|
|
+ salesClosingReport.setContractNo(saleOrder.getContractNo());
|
|
|
|
+ salesClosingReport.setClosePositionDate(saleOrder.getClosePositionDate());
|
|
|
|
+ salesClosingReport.setClosingQuantity(saleOrder.getClosingQuantity());
|
|
|
|
+ salesClosingReport.setTransactionPrice(saleOrder.getTransactionPrice());
|
|
|
|
+ salesClosingReport.setCloseRate(saleOrder.getCloseRate());
|
|
|
|
+ salesClosingReport.setBasisPrice(saleOrder.getBasis());
|
|
|
|
+ salesClosingReport.setCustomerName(saleOrder.getBuyer());
|
|
|
|
+ salesClosingReport.setWarehouseName(salePlanInfo.getSendWarehouse());
|
|
|
|
+ salesClosingReportService.insert(salesClosingReport);
|
|
if (one && two) {
|
|
if (one && two) {
|
|
return "OK";
|
|
return "OK";
|
|
} else {
|
|
} else {
|