From c94101e403cdaf332e0b80cbedab747a03a5df93 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 16 四月 2026 16:57:29 +0800
Subject: [PATCH] 定时任务开启
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 81635dd..3c5c591 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -632,8 +632,18 @@
return R.ok(resultList);
}
- // 鏈堿SN鍗曞彿鏃讹細DirectWaitPakin 鍚敤鍒欎粠鏀惰揣鍖烘煡鍙粍鎵樼墿鏂欙紝鏈惎鐢ㄥ垯浠庤鍗曟槑缁嗘煡锛堝彲缁勭洏鏁伴噺 = 璁″垝 - 宸茬粍鎵� - 宸蹭笂鏋讹級
+ // 鏈堿SN鍗曞彿鏃讹細浠呭湪鍗曟嵁瀛樺湪鏃舵寜鍗曟嵁闄愬埗缁勬墭
+ WkOrder asnOrder = null;
if (!Cools.isEmpty(asnCode)) {
+ asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
+ if (asnOrder == null) {
+ logger.info("鏈壘鍒癆SN鍗曞彿: {}锛屾寜鏃犲崟鎹粍鎵樻ā寮忚繑鍥炵墿鏂欎俊鎭�", asnCode);
+ asnCode = null;
+ }
+ }
+
+ // 鏈堿SN鍗曞彿涓斿崟鎹瓨鍦ㄦ椂锛欴irectWaitPakin 鍚敤鍒欎粠鏀惰揣鍖烘煡鍙粍鎵樼墿鏂欙紝鏈惎鐢ㄥ垯浠庤鍗曟槑缁嗘煡
+ if (!Cools.isEmpty(asnCode) && asnOrder != null) {
Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
if (directPakinConfig != null && Boolean.parseBoolean(directPakinConfig.getVal())) {
LambdaQueryWrapper<WarehouseAreasItem> receiptWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnCode, asnCode);
@@ -668,11 +678,7 @@
logger.info("=== 浠庢敹璐у尯鏌ヨ鍙粍鎵樼墿鏂欙紙DirectWaitPakin锛塧snCode: {} 杩斿洖 {} 鏉�", asnCode, receiptList.size());
return R.ok(receiptList);
}
- WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
- if (order == null) {
- logger.info("鏈壘鍒癆SN鍗曞彿: {}", asnCode);
- return R.ok(Collections.emptyList());
- }
+ WkOrder order = asnOrder;
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
Map<Long, Double> palletizedByItemId = pakinItems.stream()
.collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
@@ -1096,7 +1102,7 @@
.setType(order.getType())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setWkType(Short.parseShort(order.getWkType()));
+ .setWkType(order.getWkType());
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
@@ -1117,7 +1123,7 @@
.setUpdateBy(loginUserId)
.setUpdateBy(loginUserId)
.setOrderItemId(asnOrderItem.getId())
- .setWkType(Short.parseShort(order.getWkType()))
+ .setWkType(order.getWkType())
.setType(order.getType());
locItems.add(item);
});
--
Gitblit v1.9.1