From 2fa1c824c63048b49e45d867191ab3645aeaf3a4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 09:54:40 +0800
Subject: [PATCH] 补充收货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 8902a11..611cefc 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
@@ -59,8 +59,6 @@
@Autowired
private PurchaseService purchaseService;
@Autowired
- private RemotesInfoProperties.ApiInfo apiInfo;
- @Autowired
private RestTemplate restTemplate;
@Autowired
private RemotesInfoProperties remotesInfoProperties;
@@ -123,7 +121,7 @@
if (!remotesInfoProperties.getHost().equals("http://127.0.0.1")){
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
//鑾峰彇涓婃姤璐ㄦ鎺ュ彛
- String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
+ String url = remotesInfoProperties.getBaseUrl() + remotesInfoProperties.getApi().getNotifyInspect();
// 璁剧疆璇锋眰鍙傛暟
params.add("params", JSONObject.toJSONString(inspectParams));
log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", url, JSONObject.toJSONString(inspectParams));
@@ -302,10 +300,13 @@
//鑾峰彇搴撳瓨涓鍗曞簱浣�
Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
- Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
- .in(Stock::getId, longSet)
- .eq(Stock::getType, OrderType.ORDER_IN.type)
- .eq(Stock::getSourceCode, order.getCode()));
+ Stock stocks = null;
+ if (!longSet.isEmpty()) {
+ stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
+ .in(Stock::getId, longSet)
+ .eq(Stock::getType, OrderType.ORDER_IN.type)
+ .eq(Stock::getSourceCode, order.getCode()));
+ }
if (!Objects.isNull(stocks)) {
param.setZone(stocks.getLocCode());
}
@@ -319,8 +320,8 @@
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
.setEditDate(order.getUpdateTime())
- .setZone(stocks.getLocCode())
- .setGoodsNO(fields.get("crushNo"))
+ .setZone(stocks != null ? stocks.getLocCode() : null)
+ // .setGoodsNO(fields.get("crushNo")) // 绁ㄥ彿鏆備笉浣跨敤
.setMemoDtl(order.getMemo());
if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
@@ -393,6 +394,9 @@
//杩囨护鎷ｈ揣鍏ュ簱鏄庣粏锛岄伩鍏嶄笂鎶�
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());
+ if (list.isEmpty()) {
+ return;
+ }
List<StockItem> stockItems1 = stockItemService.list(new LambdaQueryWrapper<StockItem>().in(StockItem::getStockId, list));
String finalNickName = nickName;
stockItems1.forEach(stockItem -> {
@@ -407,7 +411,7 @@
.setItemCode(stockItem.getMatnrCode())
.setEditUser(finalNickName)
.setEditDate(order.getUpdateTime())
- .setGoodsNO(fields.get("crushNo"))
+ // .setGoodsNO(fields.get("crushNo")) // 绁ㄥ彿鏆備笉浣跨敤
.setMemoDtl(order.getMemo());
if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
//閲囪喘鍏ュ簱鍗�
@@ -500,11 +504,14 @@
.eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
//鑾峰彇搴撳瓨涓鍗曞簱浣�
List<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toList());
- //鑾峰彇搴撳瓨搴撲綅淇℃伅
- Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
- .in(Stock::getId, longSet)
- .eq(Stock::getType, OrderType.ORDER_IN.type)
- .eq(Stock::getSourceCode, order.getCode()));
+ //鑾峰彇搴撳瓨搴撲綅淇℃伅锛堥伩鍏� longSet 涓虹┖鏃剁敓鎴� stock_id IN () 瀵艰嚧 SQL 寮傚父锛�
+ Stock stocks = null;
+ if (!longSet.isEmpty()) {
+ stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
+ .in(Stock::getId, longSet)
+ .eq(Stock::getType, OrderType.ORDER_IN.type)
+ .eq(Stock::getSourceCode, order.getCode()));
+ }
if (!Objects.isNull(stocks)) {
param.setZone(stocks.getLocCode());
}
@@ -520,7 +527,7 @@
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
.setEditDate(order.getUpdateTime())
- .setGoodsNO(fields.get("crushNo"))
+ // .setGoodsNO(fields.get("crushNo")) // 绁ㄥ彿鏆備笉浣跨敤
.setMemoDtl(order.getMemo());
if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_DONE_IN.type)) {
--
Gitblit v1.9.1