From 390e00e616d40e708bd14b6f38ba4a76542a487d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 18:20:24 +0800
Subject: [PATCH] 盘点 功能调整优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

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 f00eaca..7e6e64f 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
@@ -399,13 +399,31 @@
         task.setTaskStatus(TaskStsType.GENERATE_IN.id)
                 .setTaskCode(ruleCode)
                 .setTargLoc(task.getOrgLoc())
+                .setOrgSite(task.getTargSite())
                 .setTaskType(TaskType.TASK_TYPE_CHECK_IN.type)
                 .setUpdateTime(new Date());
         if (!taskService.updateById(task)) {
             throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
         }
 
-        uploadCheckResult(task);
+        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+        if (Objects.isNull(taskItems) || taskItems.isEmpty()) {
+            throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
+        }
+
+        List<TaskItem> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("items")), TaskItem.class);
+        items.forEach(taskItem -> {
+            taskItems.forEach(item -> {
+                if (taskItem.getFieldsIndex().equals(item.getFieldsIndex())) {
+                    item.setAnfme(taskItem.getCheckQty());
+                    if (!taskItemService.updateById(item)) {
+                        throw new CoolException("鐩樼偣鏄庣粏淇敼澶辫触锛侊紒");
+                    }
+                }
+            });
+        });
+
+//        uploadCheckResult(task);
 
         return R.ok("鎻愪氦鎴愬姛");
     }
@@ -429,7 +447,6 @@
         List<ReportDataParam> reportDataParams = new ArrayList<>();
         taskItems.forEach(taskItem -> {
             ReportDataParam dataParam = new ReportDataParam();
-
             User user = userService.getById(taskItem.getUpdateBy());
             String nickName = null;
             if (!Objects.isNull(user)) {

--
Gitblit v1.9.1