From b782c4c683da89c7e389cf288e1191073afd1f51 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 五月 2025 10:03:24 +0800
Subject: [PATCH] #其他收货-》单据收货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 7 +++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java | 3 +++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
index 0f4c026..7feca0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
@@ -23,5 +23,8 @@
@ApiModelProperty("鏉″舰鐮�")
private String trackCode;
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnrCode;
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index e576ffd..9dce202 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -82,6 +82,9 @@
@ApiModelProperty("鐗╂枡鏍囪瘑")
private Long matnrId;
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnr;
+
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
private String splrCode;
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 537556c..ea7733e 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
@@ -358,7 +358,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("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -947,7 +949,8 @@
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .setSplrBatch(asnOrderItem.getSplrBatch())
+ .setMatnr(asnOrderItem.getMatnrCode());
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
--
Gitblit v1.9.1