From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +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 | 21 +++++++++++++--------
1 files changed, 13 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 d59b56d..7cbc8e9 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
@@ -368,7 +368,9 @@
}
List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()));
+ .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ );
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -958,7 +960,10 @@
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .setSplrBatch(asnOrderItem.getSplrBatch())
+ .setMatnr(asnOrderItem.getMatnrCode())
+ .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ ;
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -967,12 +972,12 @@
//SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
.setMatnrId(matnr.getId());
- QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
- if (!Objects.isNull(inspect)) {
- //set 璐ㄦ缁撴灉
- detlsDto.setInspect(inspect.getStatus$());
- }
+// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
+// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
+// if (!Objects.isNull(inspect)) {
+// //set 璐ㄦ缁撴灉
+// detlsDto.setInspect(inspect.getStatus$());
+// }
//鑾峰彇褰撳墠搴撳瓨淇℃伅
LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
--
Gitblit v1.9.1