weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增计费单据查询报错修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-29 13:24:25 +08:00
parent feafc19e17
commit 11244cf89f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+11 -9
View File
@@ -255,9 +255,10 @@ public class StockInOrderApplicationService {
if (receiptOrderAccountList != null && !receiptOrderAccountList.isEmpty()) { if (receiptOrderAccountList != null && !receiptOrderAccountList.isEmpty()) {
for (ReceiptOrderAccount receiptOrderAccount : receiptOrderAccountList) { for (ReceiptOrderAccount receiptOrderAccount : receiptOrderAccountList) {
receiptOrderAccount.setOrderId(inOrderId); receiptOrderAccount.setOrderId(inOrderId);
receiptOrderAccount.setInOrOut("in");
} }
r = receiptOrderAccountService.saveBatch(receiptOrderAccountList); r = receiptOrderAccountService.saveBatch(receiptOrderAccountList);
wholeRentSynchronizationZXF(inOrderId); wholeRentSynchronizationZXF(inOrderId,"in");
} }
return r; return r;
} }
@@ -276,9 +277,10 @@ public class StockInOrderApplicationService {
if (receiptOrderAccountList != null && !receiptOrderAccountList.isEmpty()) { if (receiptOrderAccountList != null && !receiptOrderAccountList.isEmpty()) {
for (ReceiptOrderAccount receiptOrderAccount : receiptOrderAccountList) { for (ReceiptOrderAccount receiptOrderAccount : receiptOrderAccountList) {
receiptOrderAccount.setOrderId(outOrderId); receiptOrderAccount.setOrderId(outOrderId);
receiptOrderAccount.setInOrOut("out");
} }
r = receiptOrderAccountService.saveBatch(receiptOrderAccountList); r = receiptOrderAccountService.saveBatch(receiptOrderAccountList);
wholeRentSynchronizationZXF(outOrderId); wholeRentSynchronizationZXF(outOrderId,"out");
} }
return r; return r;
} }
@@ -286,10 +288,10 @@ public class StockInOrderApplicationService {
/** /**
* 定时任务整租推送到bms装卸费 * 定时任务整租推送到bms装卸费
*/ */
public void wholeRentSynchronizationZXF(Long busId) { public void wholeRentSynchronizationZXF(Long busId,String inOrOut) {
StockInOrder stockInOrder = stockInOrderService.getOne(new QueryWrapper<StockInOrder>().lambda().eq(StockInOrder::getInOrderId, busId),false); StockInOrder stockInOrder = stockInOrderService.getOne(new QueryWrapper<StockInOrder>().lambda().eq(StockInOrder::getInOrderId, busId).eq(StockInOrder::getDelFlag, 1),false);
StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderId, busId),false); StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderId, busId).eq(StockOutOrder::getDelFlag, 1),false);
if (stockInOrder != null) { if ("in".equals(inOrOut)) {
Long shipperId = stockInOrder.getShipperId(); Long shipperId = stockInOrder.getShipperId();
Long organizationId = stockInOrder.getOrganizationId(); Long organizationId = stockInOrder.getOrganizationId();
String organizationName = stockInOrder.getOrganizationName(); String organizationName = stockInOrder.getOrganizationName();
@@ -297,7 +299,7 @@ public class StockInOrderApplicationService {
String inOrderNumber = stockInOrder.getInOrderNumber(); String inOrderNumber = stockInOrder.getInOrderNumber();
String settlementCurrency = stockInOrder.getSettlementCurrency(); String settlementCurrency = stockInOrder.getSettlementCurrency();
String salesmanId = stockInOrder.getSalesmanId(); String salesmanId = stockInOrder.getSalesmanId();
List<ReceiptOrderAccount> accounts = receiptOrderAccountService.list(new QueryWrapper<ReceiptOrderAccount>().lambda().eq(ReceiptOrderAccount::getOrderId, busId)); List<ReceiptOrderAccount> accounts = receiptOrderAccountService.list(new QueryWrapper<ReceiptOrderAccount>().lambda().eq(ReceiptOrderAccount::getOrderId, busId).eq(ReceiptOrderAccount::getInOrOut, "in"));
for (ReceiptOrderAccount account : accounts) { for (ReceiptOrderAccount account : accounts) {
BigDecimal amount = account.getAmount(); BigDecimal amount = account.getAmount();
String subjectCode = account.getSubjectCode(); String subjectCode = account.getSubjectCode();
@@ -355,7 +357,7 @@ public class StockInOrderApplicationService {
bmsServiceFeign.wholeRentSynchronizationZXF(businessDataPushDTO); bmsServiceFeign.wholeRentSynchronizationZXF(businessDataPushDTO);
} }
} }
} else if (stockOutOrder != null) { } else if ("out".equals(inOrOut)) {
Long shipperId = stockOutOrder.getShipperId(); Long shipperId = stockOutOrder.getShipperId();
Long organizationId = stockOutOrder.getOrganizationId(); Long organizationId = stockOutOrder.getOrganizationId();
String organizationName = stockOutOrder.getOrganizationName(); String organizationName = stockOutOrder.getOrganizationName();
@@ -363,7 +365,7 @@ public class StockInOrderApplicationService {
String inOrderNumber = stockOutOrder.getOutOrderNumber(); String inOrderNumber = stockOutOrder.getOutOrderNumber();
String settlementCurrency = stockOutOrder.getSettlementCurrency(); String settlementCurrency = stockOutOrder.getSettlementCurrency();
String salesmanId = stockOutOrder.getSalesmanId(); String salesmanId = stockOutOrder.getSalesmanId();
List<ReceiptOrderAccount> accounts = receiptOrderAccountService.list(new QueryWrapper<ReceiptOrderAccount>().lambda().eq(ReceiptOrderAccount::getOrderId, busId)); List<ReceiptOrderAccount> accounts = receiptOrderAccountService.list(new QueryWrapper<ReceiptOrderAccount>().lambda().eq(ReceiptOrderAccount::getOrderId, busId).eq(ReceiptOrderAccount::getInOrOut, "out"));
for (ReceiptOrderAccount account : accounts) { for (ReceiptOrderAccount account : accounts) {
String subjectCode = account.getSubjectCode(); String subjectCode = account.getSubjectCode();
String subjectName = account.getSubjectName(); String subjectName = account.getSubjectName();
mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java
+2
View File
@@ -115,4 +115,6 @@ public class ReceiptOrderAccount extends BaseVOEntity {
@ApiModelProperty(value = "计算价格json") @ApiModelProperty(value = "计算价格json")
private String amountJson; private String amountJson;
@ApiModelProperty(value = "出入库区别标识")
private String inOrOut;
} }