From 5c90daa2c919f3f07df0a154ff91f0e015bf8d66 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 17:07:28 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 8 ++++++++
3 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index ab407f3..9725c26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -37,6 +37,14 @@
}
@PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/getCheckTaskItemList2")
+ @ApiOperation("鏌ヨ鐩樼偣浠诲姟鍒楄〃,鐩存帴鎵鍣ㄧ爜")
+ public R getCheckTaskItemList2(@RequestBody Map<String, String> map) {
+
+ return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/getCheckDiffReasonList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍘熷洜")
public R getCheckDiffReasonList() {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
index 87f088b..1a69f45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
@@ -15,4 +15,6 @@
R saveCheckDiff(SaveCheckDiffParams saveCheckDiffParams,Long loginUserId);
R selectAddMatnr(Map<String, String> map);
+
+ R getCheckTaskItemList2(String barcode);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 1bfc472..8c13859 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -214,4 +214,36 @@
;
return R.ok(checkDiffItem);
}
+
+ @Override
+ public R getCheckTaskItemList2(String barcode) {
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(taskItems)){
+ throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
+ }
+ String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);
+ CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));
+ if (null == checkDiff) {
+ return R.error("鏈壘鍒扮洏鐐瑰樊寮傚崟");
+ }
+ List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getBarcode, barcode)
+ .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
+ .eq(CheckDiffItem::getOrderCode, sourceCode)
+ );
+ if (checkDiffItems.isEmpty()) {
+ throw new CoolException("姝ゆ潯鐮佷笉鍦ㄥ綋鍓嶇洏鐐瑰崟涓�");
+ }
+
+ return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
+ }
}
--
Gitblit v1.9.1