From e08ed5512006c9763c7bc3357693211ce5e315d5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 02 十二月 2025 13:14:34 +0800
Subject: [PATCH] 代码优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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 11cc866..2b6c03f 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
@@ -746,7 +746,7 @@
                 locWorking.setAnfme(taskItem.getAnfme());
             }
             BeanUtils.copyProperties(locWorking, locItem);
-            locItem.setWorkQty(0.0).setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null).setUpdateBy(loginUserId).setUpdateTime(new Date());
+            locItem.setWorkQty(0.0).setQty(0.0).setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null).setUpdateBy(loginUserId).setUpdateTime(new Date());
             items.add(locItem);
         }
 
@@ -1075,7 +1075,6 @@
             TaskItem taskItem = taskItems.stream().findFirst().get();
             taskItem.setMatnrId(working.getMatnrId())
                     .setMaktx(working.getMaktx())
-                    .setMatnrId(working.getMatnrId())
                     .setMatnrCode(working.getMatnrCode())
                     .setSpec(working.getSpec())
                     .setAnfme(working.getAnfme())
@@ -1682,8 +1681,8 @@
             LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
                     .eq(LocItem::getMatnrId, taskItem.getMatnrId())
                     .eq(LocItem::getLocId, loc.getId())
-                    .eq(StringUtils.isNoneBlank(taskItem.getBatch()), LocItem::getBatch, taskItem.getBatch())
-                    .eq(StringUtils.isNoneBlank(taskItem.getFieldsIndex()), LocItem::getFieldsIndex, taskItem.getFieldsIndex()));
+                    .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItem::getBatch, taskItem.getBatch())
+                    .eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItem::getFieldsIndex, taskItem.getFieldsIndex()));
             if (Objects.isNull(locItem)) {
                 BeanUtils.copyProperties(taskItem, item);
                 item.setLocCode(loc.getCode())
@@ -1696,11 +1695,12 @@
                     throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
                 }
             } else {
-                locItem.setAnfme(Math.round((locItem.getAnfme() + taskItem.getAnfme()) * 1000000) / 1000000.0)
-                        .setUpdateTime(new Date());
-                if (!locItemService.saveOrUpdate(locItem)) {
-                    throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
-                }
+                throw new CoolException("褰撳墠绁ㄥ彿宸插湪搴撳唴锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
+//                locItem.setAnfme(Math.round((locItem.getAnfme() + taskItem.getAnfme()) * 1000000) / 1000000.0)
+//                        .setUpdateTime(new Date());
+//                if (!locItemService.saveOrUpdate(locItem)) {
+//                    throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+//                }
             }
         });
 

--
Gitblit v1.9.1