From 48b875f66aa0b9346b698e600f03361e972028e8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 19 六月 2025 18:33:22 +0800
Subject: [PATCH] 波次出库任务失败

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index dc7c842..4b61f5d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -120,8 +120,8 @@
         try {
             generateOutTask(items, loginUserId, waves);
         } catch (Exception e) {
-            log.error(e.getMessage());
-            throw new CoolException("鍑哄簱浠诲姟鐢熸垚澶辫触锛侊紒锛�");
+            log.error("UNK", e);
+            throw new CoolException(e.getMessage());
         }
         return null;
     }
@@ -142,16 +142,19 @@
         for (WaveItem param : itemParams) {
             String locs = param.getStockLocs();
             List<LocItem> locItems = JSONArray.parseArray(locs, LocItem.class);
-            if (locItems.isEmpty()) {
-                continue;
+            List<Long> list = new ArrayList<>();
+            if (Objects.isNull(locItems) || locItems.isEmpty()) {
+                //TODO
+            } else {
+                list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
             }
-            List<Long> list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
+
             /**鏍规嵁渚涘簲鍟嗘壒娆★紝鐗╂枡鐮侊紝 鍔ㄦ�佸瓧娈垫煡璇㈡寚瀹氱殑鐗╂枡搴撳瓨淇℃伅*/
             //TODO 杩欓噷闇�瑕佽鏍规嵁娉㈡瑙勫垯鏌ユ壘搴撳瓨淇℃伅
             List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
-                    .eq(LocItem::getSplrBatch, param.getSplrBatch())
-                    .in(LocItem::getLocId, list)
-                    .eq(StringUtils.isNotBlank(param.getFieldsIndex()), LocItem::getFieldsIndex, param.getFieldsIndex())
+                    .eq(LocItem::getBatch, param.getSplrBatch())
+                    .in(!list.isEmpty(),  LocItem::getLocId, list)
+//                    .eq(StringUtils.isNotBlank(param.getFieldsIndex()), LocItem::getFieldsIndex, param.getFieldsIndex())
                     .eq(LocItem::getMatnrCode, param.getMatnrCode()));
             if (items.isEmpty()) {
                 throw new CoolException("搴撳瓨淇℃伅鏈夊彉锛岃鍙栨秷褰撳墠娉㈡锛岀敓鏂扮敓鎴愭柊鐨勬尝娆★紒锛�");
@@ -190,10 +193,10 @@
                 throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
             }
 
-            List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, wave.getId()));
-            if (items.isEmpty()) {
-                throw new CoolException("娉㈡浠诲姟宸茬敓鎴愶紝涓嶈兘閲嶅鐢熸垚锛侊紒");
-            }
+//            List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, wave.getId()));
+//            if (!items.isEmpty()) {
+//                throw new CoolException("娉㈡浠诲姟宸茬敓鎴愶紝涓嶈兘閲嶅鐢熸垚锛侊紒");
+//            }
 
             task.setTaskCode(ruleCode)
                     .setTaskType(TaskType.TASK_TYPE_OUT.type)
@@ -214,7 +217,7 @@
                 TaskItem taskItem = new TaskItem();
                 BeanUtils.copyProperties(item, taskItem);
                 taskItem.setTaskId(task.getId())
-                        .setAnfme(waveItem.getAnfme())
+                        .setAnfme(item.getAnfme())
                         .setId(null)
                         .setSourceCode(wave.getCode())
                         .setSourceId(wave.getId())
@@ -229,7 +232,7 @@
             taskItems.forEach(item -> {
                 boolean update = waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
                         .eq(WaveItem::getId, item.getSource())
-                                .set(WaveItem::getExceStatus, AsnExceStatus)
+                                .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_SEED.val)
                         .set(WaveItem::getWorkQty, item.getAnfme()));
                 if (!update) {
                     throw new CoolException("娉㈡鎵ц鏁伴噺淇敼澶辫触锛侊紒");

--
Gitblit v1.9.1