From 3aea803e459e7938c11e7bbc224c66595f45668f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 三月 2025 18:34:56 +0800
Subject: [PATCH] #优化 代码优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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 a1846d2..b740cd0 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
@@ -146,7 +146,10 @@
         if (Objects.isNull(params.getWhAreaId())) {
             throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
         }
-        WarehouseAreasItem areasItem = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAreaId, params.getWhAreaId()));
+        WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
+        if (Objects.isNull(areasItem)) {
+            throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶅簱鍖轰笉瀛樺湪锛侊紒");
+        }
         List<ReceiptDetlsDto> receipts = params.getReceipts();
         List<WarehouseAreasItem> allOrders =   new ArrayList<>();
         receipts.forEach(dto -> {
@@ -156,8 +159,8 @@
             }
             WarehouseAreasItem item = new WarehouseAreasItem();
             item.setBarcode(dto.getBarcode())
-                    .setAreaName(areasItem.getAreaName())
-                    .setAreaId(areasItem.getAreaId())
+                    .setAreaName(areasItem.getName())
+                    .setAreaId(areasItem.getId())
                     .setStockUnit(dto.getStockUnit())
                     .setBatch(SerialRuleUtils.generateRuleCode("sys_receipt_batch", dto))
                     .setAnfme(dto.getReceiptQty())
@@ -193,13 +196,9 @@
         if (Objects.isNull(params.getAsnCode())) {
             throw new CoolException("閫氱煡鍗曚笉鑳戒负绌猴紒锛�");
         }
-        if (Objects.isNull(params.getBarcode())) {
-            throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
-        }
-
         AsnOrderItem asnOrderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
                 .eq(AsnOrderItem::getAsnCode, params.getAsnCode())
-                .eq(AsnOrderItem::getBarcode, params.getBarcode()));
+                .eq(!Objects.isNull(params.getBarcode()) ,AsnOrderItem::getBarcode, params.getBarcode()));
 
         if (Objects.isNull(asnOrderItem)) {
             throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");

--
Gitblit v1.9.1