From 2e929cc5c44e4072520aae4c8a9f40029da27405 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 18 十一月 2025 17:29:13 +0800
Subject: [PATCH] 上报站点报异常 二次组托异常
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 16 ++++++++++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 39 +++++++++++++++++++++------------------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 4 +++-
3 files changed, 36 insertions(+), 23 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 9398609..6f31073 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
@@ -555,7 +555,9 @@
.or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
.or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
- list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ if (!list.isEmpty()) {
+ list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ }
list.forEach(item -> {
Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
item.setExtendFields(fields);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 810f26b..b2cca17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -478,16 +478,19 @@
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
tasks.forEach(task -> {
- BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
- if (Objects.isNull(curSta)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
- }
+
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+
+ BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
+ if (Objects.isNull(curSta)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
+
if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -507,6 +510,11 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.isNull(curSta)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
+
if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 2fb0faf..00b16df 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -68,18 +68,20 @@
if (!tasks.isEmpty()) {
throw new CoolException("褰撳墠鎵樼洏宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
}
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
- waitPakinItems.forEach(item -> {
- for (PakinItem pakinItem : waitPakin.getItems()) {
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
- if (Objects.isNull(warehouseAreasItems)) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
+ if (!Objects.isNull(pakin)) {
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(!Objects.isNull(pakin.getId()) ,WaitPakinItem::getPakinId, pakin.getId()));
+ waitPakinItems.forEach(item -> {
+ for (PakinItem pakinItem : waitPakin.getItems()) {
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
+ if (Objects.isNull(warehouseAreasItems)) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
+ }
+ if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
+ throw new CoolException("绁ㄥ彿锛�" + item.getExtendFields().get("crushNo") + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
+ }
}
- if (item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
- throw new CoolException("绁ㄥ彿锛�" + item.getExtendFields().get("crushNo") + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
- }
- }
- });
+ });
+ }
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
if (!locs.isEmpty()) {
@@ -88,11 +90,6 @@
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
}
double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
- Double waitSum = 0.0;
- if (!waitPakinItems.isEmpty()) {
- waitSum = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- }
- Double total = Math.round((sum + waitSum) * 100) / 100.0;
WaitPakin waitPakin1 = new WaitPakin();
if (Objects.isNull(pakin)) {
@@ -162,7 +159,13 @@
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
}
-// Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin1.getId()));
+ Double waitSum = 0.0;
+ if (!pakinItems.isEmpty()) {
+ waitSum = pakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ }
+// Double total = Math.round((sum + waitSum) * 100) / 100.0;
for (WaitPakinItem pakinItem : items) {
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
@@ -181,7 +184,7 @@
}
}
- waitPakin1.setAnfme(total);
+ waitPakin1.setAnfme(waitSum);
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
}
--
Gitblit v1.9.1