From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 十二月 2024 15:15:01 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/common/model/DetlDto.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index e2e8bb3..fafced2 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -13,15 +13,28 @@
@Data
public class DetlDto {
- private String orderNo;
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
+ private String matnr; //鐗╂枡缂栫爜
+ private String maktx; //鐗╂枡鍚嶇О
+ private String batch; //鎵规
+ private Double anfme; //鏁伴噺
+ private String orderNo; //璁㈠崟鍙�
+ private String fromOrderNo; //鏉ユ簮鍗曞彿
+ private String memo; //澶囨敞
+ private String mark;
+ private String customer;
+ private String suppName = "";
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) {
@@ -29,10 +42,21 @@
this.anfme = anfme;
}
+ public DetlDto(String matnr, String batch) {
+ this.matnr = matnr;
+ this.batch = batch;
+ }
+
public DetlDto(String matnr, String batch, Double anfme) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ }
+ public DetlDto(String matnr, String batch, Double anfme,String mark) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.mark = mark;
}
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
@@ -61,16 +85,8 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(detlDto.getBatch())) {
- if (dto.getMatnr().equals(detlDto.getMatnr())) {
- return true;
- }
- } else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(detlDto.getBatch())) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && dto.getBatch().equals(detlDto.getBatch())) {
- return true;
- }
- }
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ return true;
}
}
return false;
@@ -81,19 +97,7 @@
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (!matnr.equals(detlDto.getMatnr())) {
- continue;
- }
- if (Cools.isEmpty(batch) && Cools.isEmpty(detlDto.getBatch())) {
- return detlDto;
- }
- if (Cools.isEmpty(batch) && !Cools.isEmpty(detlDto.getBatch())) {
- continue;
- }
- if (Cools.isEmpty(detlDto.getBatch()) && !Cools.isEmpty(batch)) {
- continue;
- }
- if (batch.equals(detlDto.getBatch())) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
return detlDto;
}
}
--
Gitblit v1.9.1