From 288c922ec677b46d1c13442137c174515e3e8929 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 08 十一月 2025 17:06:40 +0800
Subject: [PATCH] 组托功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 3 +--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 14 ++++++++++++++
2 files changed, 15 insertions(+), 2 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 23933bb..566f5be 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
@@ -537,16 +537,30 @@
Object code = params.get("code");
Object matnrCode = params.get("matnrCode");
Object asnCode = params.get("asnCode");
+ Object crushNo = params.get("fieldsIndex");
Object batch = params.get("batch");
+ String fieldIndex = null;
+ if (!Objects.isNull(crushNo)) {
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, crushNo).last("Limit 1"));
+ if (!Objects.isNull(fieldsItem)) {
+ fieldIndex = fieldsItem.getUuid();
+ }
+ }
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
.or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
.or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+ .or().eq(!Cools.isEmpty(fieldIndex), WarehouseAreasItem::getFieldsIndex, fieldIndex)
.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());
+ list.forEach(item -> {
+ Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
+ item.setExtendFields(fields);
+ });
+
return R.ok(list);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 1409e78..37a7bf8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -210,7 +210,7 @@
}
}
}
- //妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
+ //妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
// Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
// if (waveChecked){
// Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
@@ -222,7 +222,6 @@
// throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
// }
// }
-
}
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
--
Gitblit v1.9.1