From 7f26038db785f902097422bfeaccfd52767fc7e1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 四月 2025 09:42:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 6df867e..8edde8a 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
@@ -599,18 +599,15 @@
if (!waitPakins.isEmpty()) {
throw new CoolException("鎷栫洏宸蹭娇鐢�!!");
}
- List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
+ AsnOrderItem orderItems = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, asnOrders.getId())
.eq(AsnOrderItem::getMatnrCode, params.getMatnrCode()));
- if (orderItems.isEmpty()) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ if (Objects.isNull(orderItems)) {
+ return R.ok(null);
}
- List<AsnOrderItem> stocks = new ArrayList<>();
- orderItems.forEach(item -> {
- item.setBarcode(params.getBarcode());
- stocks.add(item);
- });
- return R.ok(stocks);
+ orderItems.setBarcode(params.getBarcode());
+
+ return R.ok(orderItems);
}
/**
--
Gitblit v1.9.1