From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
index 2997e54..42a61dc 100644
--- a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@@ -12,19 +13,22 @@
private Integer palletizingNo;// 鐮佸灈浣嶇紪鍙�
private List<MatList> matList; // 鏈ㄧ闆嗗悎
-
+ //1涓�鍘傚钩搴� 2 涓�鍘傜珛搴� 3浜屽巶骞冲簱 4浜屽巶绔嬪簱
+ private Integer warehouseType ;
@Data
public static class MatList{
private String boxPos; // 绠卞瓙浣嶇疆
private String packageGroupNo; // 鍖呰缁勫彿
+ private String outOrIn; // out鍑猴紝in鍏�
+ private String stockType; // 鍑哄叆绫诲瀷
private String boxType; // 鏈ㄧ绫诲瀷
private String rollType; // 绠¤姱绫诲瀷
private String wideInWidth; // 瀹炴祴瀹藉箙锛堝垎鍒囨垚鍝佷笅鏂欙級
private String thickness; // 鐢熺當鍘氬害锛堝垎鍒囨垚鍝佷笅鏂欙級
- private String fqTime; // 鍒嗗垏涓嬫枡鏃堕棿
private List<Rolls> rolls; // 鍗烽泦鍚�
}
@Data
+ @AllArgsConstructor
public static class Rolls{
private String rollNo; // 鍗峰彿
private String boxNo; // 绠卞彿
@@ -33,5 +37,6 @@
private Integer splices; //鎺ュご 涓�
private Double netWeight; // 鍑�閲�
private Double grossWeight; // 姣涢噸
+ private String fqTime; // 鍒嗗垏涓嬫枡鏃堕棿
}
}
--
Gitblit v1.9.1