From 2c945116a7d4dccac387930e40980ae1ba32f05c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 16:18:58 +0800
Subject: [PATCH] 物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 568b7e6..37e6ea1 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,56 +1,62 @@
package com.zy.asrs.entity.param;
+import lombok.Data;
+
import java.util.List;
/**
* Created by vincent on 2020/6/28
*/
+@Data
public class CombParam {
+
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
// 鎵樼洏鏉＄爜
private String barcode;
+ // 鎵樼洏鏉＄爜
+ private Short containerType;
+
+ // 搴撲綅缂栧彿
+ private String locno;
+
+ // 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+ private Integer locType;
+
+ //绗簩鍗曚綅鏁伴噺
+ private Double anfme;
+
private List<CombMat> combMats;
+ @Data
public static class CombMat {
+ //鏂欐兂鐮�
+ private String containerCode;
+
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
+
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
- public String getMatNo() {
- return matNo;
- }
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
+ // 瑙勬牸
+ private String specs;
}
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public List<CombMat> getCombMats() {
- return combMats;
- }
-
- public void setCombMats(List<CombMat> combMats) {
- this.combMats = combMats;
- }
}
--
Gitblit v1.9.1