From 8320d8a04fec16cec42b7045e44405f50488b7f4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 29 十一月 2024 13:57:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/DetlDto.java | 10 ++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d4d9dc7..b000233 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -114,7 +114,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getMark());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo(), detail.getMark(),detail.getCustomer(),detail.getSuppName());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -255,7 +255,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo(), detail.getMark(),detail.getCustomer(),detail.getSuppName());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 9b28af0..2db5768 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -27,6 +27,16 @@
public DetlDto() {
}
+ public DetlDto(String matnr, String batch, Double anfme,String fromOrderNo,String mark,String customer,String suppName) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.fromOrderNo = fromOrderNo;
+ this.mark = mark;
+ this.customer = customer;
+ this.suppName = suppName;
+ }
+
public DetlDto(String matnr, Double anfme) {
this.matnr = matnr;
this.anfme = anfme;
--
Gitblit v1.9.1