From b5e4bbec339bf3858338deece026a20bc40b8923 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 15:45:32 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 7cbc8e9..d0df993 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -23,6 +23,7 @@
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.enums.AsnExceStatus;
 import com.vincent.rsf.server.manager.enums.PakinIOStatus;
+import com.vincent.rsf.server.manager.enums.QlyIsptResult;
 import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
 import com.vincent.rsf.server.manager.mapper.*;
 import com.vincent.rsf.server.manager.service.*;
@@ -293,15 +294,9 @@
             if (asnOrderItemMapper.updateById(orderItem) < 1) {
                 throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
             }
+            /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+            extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
 
-            List<QlyIsptItem> isptItems = qlyIsptItemService.list(new LambdaQueryWrapper<QlyIsptItem>().eq(QlyIsptItem::getAsnItemId, dto.getId()));
-            if (isptItems.isEmpty()) {
-                extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
-            } else {
-                for (QlyIsptItem isptItem : isptItems) {
-                    extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
-                }
-            }
         }
 
         AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
@@ -340,19 +335,38 @@
                 .setFieldsIndex(orderItem.getFieldsIndex())
                 .setShipperId(matnr.getShipperId());
         //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
-
         WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
                 .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
                 .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
                 .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
         if (!Objects.isNull(serviceOne)) {
             item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
-            item.setId(serviceOne.getId());
         }
 
+        //鏈川妫�
         if (!warehouseAreasItemService.saveOrUpdate(item)) {
             throw new CoolException("鏀惰揣澶辫触锛侊紒");
         }
+
+//        if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
+//
+//        }
+//        else {
+//            //涓嶅悎鏍兼暟閲�
+//            if (orderItem.getDisQty().compareTo(0.00) > 0) {
+//                item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
+//                if (!warehouseAreasItemService.saveOrUpdate(item)) {
+//                    throw new CoolException("鏀惰揣澶辫触锛侊紒");
+//                }
+//            }
+//
+//            item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
+//            if (!warehouseAreasItemService.saveOrUpdate(item)) {
+//                throw new CoolException("鏀惰揣澶辫触锛侊紒");
+//            }
+//        }
+
+
     }
 
     /**

--
Gitblit v1.9.1