From a7e9d0a982fc4e2d8e88d397d259dd3ebcfc2cff Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 18 三月 2025 11:13:26 +0800
Subject: [PATCH] fix:物料导入修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 956f040..6a5a632 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())
@@ -255,8 +258,10 @@
.setStockUnit(matnr.getStockUnit());
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
.eq(QlyInspect::getAsnItemId, asnOrderItem.getId()).eq(QlyInspect::getPoItemId, asnOrderItem.getPoDetlId()));
- //set 璐ㄦ缁撴灉
- detlsDto.setInspect(inspect.getStatus$());
+ if (!Objects.isNull(inspect)) {
+ //set 璐ㄦ缁撴灉
+ detlsDto.setInspect(inspect.getStatus$());
+ }
//鑾峰彇褰撳墠搴撳瓨淇℃伅
StockItem stockItem = stockItemMapper.selectOne(new LambdaQueryWrapper<StockItem>()
.eq(StockItem::getAsnItemId, asnOrderItem.getId())
--
Gitblit v1.9.1