From b7b3328fdfa45cf13d1943fa79d47f1b6bb43f01 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 18:22:17 +0800
Subject: [PATCH] 添加定时任务用户

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java |   51 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index f04bf96..08c9f56 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -190,7 +190,8 @@
         WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
         if (!Objects.isNull(serviceOne)) {
             item.setId(serviceOne.getId());
-            item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+            Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+            item.setAnfme(anfme);
         }
         //鏈川妫�
         if (!warehouseAreasItemService.saveOrUpdate(item)) {
@@ -329,7 +330,7 @@
     @Transactional(rollbackFor = Exception.class)
     public void pakinLog() {
         List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
-                .eq(WaitPakin::getIoStatus, Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val))
+                .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
                 .select(WaitPakin::getId));
         if (pakinIds.isEmpty()) {
             return;
@@ -339,32 +340,36 @@
         if (pakins.isEmpty()) {
             throw new CoolException("缁勬嫋鍗曚负绌猴紒锛�");
         }
-        List<WaitPakinLog> pakinLogs = new ArrayList<>();
         pakins.forEach(pakin -> {
             WaitPakinLog log = new WaitPakinLog();
             BeanUtils.copyProperties(pakin, log);
-            log.setPakinId(pakin.getId()).setIoStatus(Short.parseShort("2"));
-            pakinLogs.add(log);
-        });
-        if (!waitPakinLogService.saveBatch(pakinLogs)) {
-            throw new CoolException("鍘嗗彶妗d繚瀛樺け璐ワ紒锛�");
-        }
-        List<WaitPakinItemLog> itemLogs = new ArrayList<>();
-        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list));
-        if (pakinItems.isEmpty()) {
-            throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
-        }
-        pakinItems.forEach(item -> {
-            WaitPakinItemLog itemLog = new WaitPakinItemLog();
-            BeanUtils.copyProperties(item, itemLog);
-            itemLog.setPakinItemId(item.getId())
-                    .setPakinId(item.getPakinId());
-            itemLogs.add(itemLog);
+            log.setPakinId(pakin.getId()).setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val);
+
+            if (!waitPakinLogService.save(log)) {
+                throw new CoolException("缁勬墭鏃ュ織淇濆瓨澶辫触锛侊紒");
+            }
+            List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, pakin.getId()));
+            if (pakinItems.isEmpty()) {
+                throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
+            }
+            List<WaitPakinItemLog> itemLogs = new ArrayList<>();
+
+            pakinItems.forEach(item -> {
+                WaitPakinItemLog itemLog = new WaitPakinItemLog();
+                BeanUtils.copyProperties(item, itemLog);
+                itemLog.setPakinItemId(item.getId())
+                        .setLogId(log.getId())
+                        .setQty(item.getWorkQty())
+                        .setWorkQty(0.0)
+                        .setPakinId(item.getPakinId());
+                itemLogs.add(itemLog);
+            });
+
+            if (!waitPakinItemLogService.saveBatch(itemLogs)) {
+                throw new CoolException("鍘嗗彶鏄庣粏妗d繚瀛樺け璐ワ紒锛�");
+            }
         });
 
-        if (!waitPakinItemLogService.saveBatch(itemLogs)) {
-            throw new CoolException("鍘嗗彶鏄庣粏妗d繚瀛樺け璐ワ紒锛�");
-        }
         if (!waitPakinService.removeByIds(list)) {
             throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
         }

--
Gitblit v1.9.1