From c42346453608186971fad5e80ffd08fd58d38d06 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:42:45 +0800
Subject: [PATCH] 完善erp对接
---
src/main/java/com/zy/common/model/DetlDto.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 99c2dbb..7ae4f91 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,9 +21,34 @@
private String fromOrderNo; //鏉ユ簮鍗曞彿
private String memo; //澶囨敞
private String mark;
- private String customer;
+ private String customer = ""; //瀹㈡埛鍚嶇О
+ private String suppName = ""; //渚涘簲鍟�
+ private String temp1 = "";
+ private String temp2 = "";
+ private String temp3 = "";
+ private String temp4 = "";
+ private Double actulQty;
+ private Integer danger;
+ private Integer quality;
+ private String batchNum;
+ private String code;
+ private String productionCode;
public DetlDto() {
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme, String fromOrderNo, String mark, String customer, String suppName, String temp1, String temp2, String temp3, String temp4) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.fromOrderNo = fromOrderNo;
+ this.mark = mark;
+ this.customer = customer;
+ this.suppName = suppName;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ this.temp4 = temp4;
}
public DetlDto(String matnr, Double anfme) {
@@ -41,7 +66,8 @@
this.batch = batch;
this.anfme = anfme;
}
- public DetlDto(String matnr, String batch, Double anfme,String mark) {
+
+ public DetlDto(String matnr, String batch, Double anfme, String mark) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
@@ -74,7 +100,7 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) &&Cools.eq(dto.getFromOrderNo(),detlDto.getFromOrderNo())) {
return true;
}
}
@@ -93,4 +119,19 @@
return null;
}
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String threeCode) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ if (Cools.isEmpty(threeCode)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && threeCode.equals(detlDto.getFromOrderNo())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1