From feaedd288d15f7a0377f32999db8efead3f5b672 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期四, 11 十二月 2025 17:15:21 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 56a5de0..c6a34ec 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -249,6 +249,7 @@
params.setAction("Update").setOrderType("PD_stock");
HttpEntity httpEntity = new HttpEntity(params, headers);
+
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
log.info("鐩樼偣搴撳瓨淇敼锛岃繑鍥炵粨鏋滐細 {}", exchange);
if (Objects.isNull(exchange.getBody())) {
@@ -277,6 +278,7 @@
* @version 1.0
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void reportOrders(WkOrder order) {
ReportParams params = new ReportParams();
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
@@ -348,7 +350,7 @@
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
//鐢熶骇琛ユ枡
- params.setOrderType("WR_Instock_BL").setAction("Update");
+ params.setOrderType("WO_Outstock_BL").setAction("Update");
param.setOutQty(orderItem.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
params.setOrderType("WO_Outstock_WR").setAction("Update");
@@ -369,7 +371,7 @@
try {
R reported = uploadReportOrders(params);
if (Integer.valueOf(reported.get("code").toString()) == 200) {
- order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
+ order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val).setReportOnce(5);
asnOrderService.updateById(order);
}
} catch (Exception e) {
@@ -377,7 +379,7 @@
}
try {
//浼戠湢3绉�
- Thread.sleep(3000);
+ Thread.sleep(300);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -389,7 +391,7 @@
Set<Long> stockIds = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
List<Stock> stocks = stockService.listByIds(stockIds);
//杩囨护鎷ｈ揣鍏ュ簱鏄庣粏锛岄伩鍏嶄笂鎶�
- List<Stock> stockList = stocks.stream().filter(stock -> stock.getType().equals(OrderType.ORDER_OUT.type)).collect(Collectors.toList());
+ List<Stock> stockList = stocks.stream().filter(stock -> stock.getType().equals(OrderType.ORDER_OUT.type) && !Objects.isNull(stock.getSourceCode())).collect(Collectors.toList());
List<Long> list = stockList.stream().map(Stock::getId).collect(Collectors.toList());
List<StockItem> stockItems1 = stockItemService.list(new LambdaQueryWrapper<StockItem>().in(StockItem::getStockId, list));
String finalNickName = nickName;
@@ -432,7 +434,7 @@
param.setOutQty(stockItem.getAnfme());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
//鐢熶骇琛ユ枡
- params.setOrderType("WR_Instock_BL").setAction("Update");
+ params.setOrderType("WO_Outstock_BL").setAction("Update");
param.setOutQty(stockItem.getAnfme());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
params.setOrderType("WO_Outstock_WR").setAction("Update");
@@ -461,7 +463,7 @@
}
try {
//浼戠湢3绉�
- Thread.sleep(3000);
+ Thread.sleep(300);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -497,7 +499,7 @@
List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
.eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
//鑾峰彇搴撳瓨涓鍗曞簱浣�
- Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
+ List<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toList());
//鑾峰彇搴撳瓨搴撲綅淇℃伅
Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
.in(Stock::getId, longSet)
@@ -548,7 +550,7 @@
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
//鐢熶骇琛ユ枡
- params.setOrderType("WR_Instock_BL").setAction("Update");
+ params.setOrderType("WO_Outstock_BL").setAction("Update");
param.setOutQty(orderItem.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
params.setOrderType("WO_Outstock_WR").setAction("Update");
@@ -578,7 +580,7 @@
try {
//浼戠湢3绉�
- Thread.sleep(3000);
+ Thread.sleep(300);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.1