From 400881f9103218313c552b254c8312b54a24f563 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 08 五月 2026 12:36:59 +0800
Subject: [PATCH] 转历史单优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 48b828f..c679e2b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -994,8 +994,11 @@
         if (!taskService.updateById(task)) {
             throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
         }
-        // 9.1 鍏�/鍑哄簱缁撴灉涓婃姤锛氭嫞鏂欏啀鍏ュ簱/鐩樼偣鍐嶅叆搴撳畬鎴愬悗閫氱煡浜戜粨锛堜笌瀹氭椂浠诲姟闂幆涓�鑷达級
-        reportInOutResultToCloud(task, loc, taskItems, null, true);
+        // 鐩樼偣鍐嶅叆搴撲笂鎶ヤ簯浠撳叆搴撳畬鎴愶紱鎷f枡鍐嶅叆搴撹烦杩囷紙鍏ュ簱渚� qty 鍙� anfme 涓烘墭鐩樹綑閲忥紱浜戜粨鍑哄簱瀹炲彂鍦ㄥ嚭搴撳畬鎴愪晶锛�
+        // reportInOutResultToCloud(task, loc, taskItems, null, true);
+        if (!TaskType.TASK_TYPE_PICK_IN.type.equals(task.getTaskType())) {
+            reportInOutResultToCloud(task, loc, taskItems, null, true);
+        }
     }
 
     /**
@@ -1705,10 +1708,16 @@
                 if (group == null || group.isEmpty()) continue;
                 TaskItem rep = group.get(0);
                 TaskItem ti = new TaskItem();
-                ti.setTaskId(pickInTask.getId());
-                ti.setMatnrId(rep.getMatnrId()).setMaktx(rep.getMaktx()).setMatnrCode(rep.getMatnrCode());
-                ti.setBatch(rep.getBatch()).setFieldsIndex(rep.getFieldsIndex()).setUnit(rep.getUnit()).setSpec(rep.getSpec()).setModel(rep.getModel());
-                ti.setAnfme(rem).setQty(0.0);
+                BeanUtils.copyProperties(rep, ti);
+                ti.setId(null)
+                        .setTaskId(pickInTask.getId())
+                        .setAnfme(rem)
+                        .setQty(0.0)
+                        .setWorkQty(0.0)
+                        .setCreateBy(loginUserId)
+                        .setUpdateBy(loginUserId)
+                        .setCreateTime(new Date())
+                        .setUpdateTime(new Date());
                 taskItemService.save(ti);
                 LocItemWorking w = new LocItemWorking();
                 w.setTaskId(pickInTask.getId());

--
Gitblit v1.9.1