From 0d692433815cd80bab48091829c427e22d4663d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 15:27:04 +0800
Subject: [PATCH] 盘点差异单功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 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 b6a9e2d..481e56e 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
@@ -1,6 +1,7 @@
 package com.vincent.rsf.server.api.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
@@ -128,7 +129,7 @@
                         .setOrderType(OrderType.ORDER_CHECK.type)
                         .setSourceCode(diffItem.getOrderCode())
                         .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
-                        .setAnfme(diffItem.getAnfme())
+                        .setAnfme(diffItem.getCheckQty())
                         .setWorkQty(0.0)
                         .setBatch(diffItem.getBatch())
                         .setMaktx(matnr.getName())
@@ -151,7 +152,7 @@
                     throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒");
                 }
 
-                diffItem.setTaskItemId(taskItem.getId());
+                diffItem.setTaskItemId(taskItem.getId()).setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
 
                 if (!checkDiffItemService.updateById(diffItem)) {
                     throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
@@ -162,14 +163,18 @@
                     return R.error("鏁版嵁閿欒锛屾湭鎵惧埌宸紓鍗曟槑缁�");
                 }
                 diffItem.setCheckQty(ckDiffItem.getCheckQty()).setReason(ckDiffItem.getReason()).setMemo(ckDiffItem.getMemo());
-            }
 
-            diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
-            if (!checkDiffItemService.updateById(diffItem)) {
-                throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+                diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+                if (!checkDiffItemService.updateById(diffItem)) {
+                    throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+                }
+
+                if (!taskItemService.update(new LambdaUpdateWrapper<TaskItem>()
+                        .set(TaskItem::getAnfme, diffItem.getCheckQty())
+                        .eq(TaskItem::getId, diffItem.getTaskItemId()))) {
+                    throw new CoolException("浠诲姟鏁伴噺淇敼澶辫触锛侊紒");
+                }
             }
-//            Double checkQty = Math.round((checkDiff.getCheckQty() + diffItem.getCheckQty()) * 10000) / 10000.0;
-//            checkDiff.setCheckQty(checkQty);
         }
 
         List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()

--
Gitblit v1.9.1