From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请
---
src/main/java/com/zy/common/model/MatDto.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 316a804..b35f62a 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -28,6 +28,9 @@
//杈呮暟閲�
private Double weight;
+ // 杈呭簱浣嶆暟閲�
+ private Double totalWeight;
+
//鎵樼洏鐮�
private String barcode;
@@ -40,20 +43,42 @@
//瀹㈡埛鍚嶇О
private String supp;
+ //寮�绁ㄥ鎴峰悕绉�
+ private String kpCstmrName;
+
+ //鍗曞彿
+ private String orderNo;
+
+ private String cstateid;
+
public MatDto() {
}
- public MatDto(String matNo, String maktx, Double count, Double weight, Double total, String specs, String sku, String barcode, String model, String supp) {
+ public MatDto(String matNo, String maktx, Double count, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName, String orderNo, String cstateid) {
this.matnr = matNo;
this.maktx = maktx;
this.maknx = maktx;
this.specs = specs;
this.count = count;
- this.total = total;
this.weight = weight;
+ this.total = total;
+ this.totalWeight = totalWeight;
this.sku = sku;
this.barcode = barcode;
this.model = model;
this.supp = supp;
+ this.kpCstmrName = kpCstmrName;
+ this.orderNo = orderNo;
+ this.cstateid = cstateid;
+ }
+
+ public MatDto(String matNo, String maktx, Double count,Double total,String specs,String sku) {
+ this.specs = specs;
+ this.matnr = matNo;
+ this.maktx = maktx;
+ this.maknx = maktx;
+ this.count = count;
+ this.total = total;
+ this.sku = sku;
}
}
--
Gitblit v1.9.1