From d04fe2f4e7fc1f46ef4e85e640eefdd9127b4db3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 15:01:48 +0800
Subject: [PATCH] 入库单功能优化
---
src/main/java/com/zy/common/model/DetlDto.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..6369afb 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -17,7 +17,10 @@
private String orderNo;
+ private Long orderId;
+
private String matnr;
+
private String batch = "";
private String brand = "";
@@ -32,11 +35,12 @@
private String boxType3 = "1";
private Double anfme;
+ private String threeCode;
public DetlDto() {
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -46,9 +50,10 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -59,9 +64,11 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -72,9 +79,11 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -86,6 +95,8 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
// public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
@@ -102,7 +113,7 @@
// this.anfme = anfme;
// }
- public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.orderNo = orderNo;
this.matnr = matnr;
this.batch = batch;
@@ -115,6 +126,8 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
--
Gitblit v1.9.1