From 9b36259270078e99c7665a818fff90bbcde8ef7d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 18 三月 2026 09:23:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/common/model/DetlDto.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d58542b..ef22a41 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
+import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -29,6 +30,9 @@
//閿�鍞鍗曡鍙�
private String isoseq;
+
+ private Date proddate;
+ private Date deadline;
public DetlDto() {
}
@@ -58,6 +62,17 @@
this.containerCode = containerCode;
}
+ public DetlDto(String matnr, String batch, Double anfme, String csocode, String isoseq, String containerCode,Date proddate,Date deadline) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
+ this.proddate = proddate;
+ this.deadline = deadline;
+ }
+
public DetlDto(String orderNo, String matnr, String batch, Double anfme, String csocode, String isoseq) {
this.orderNo = orderNo;
this.matnr = matnr;
--
Gitblit v1.9.1