From d40170ddacd861d4e003ec69f7a87ea1431be4cd Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 13 一月 2025 15:54:42 +0800
Subject: [PATCH] 优化定时任务，添加自动接单（未完成，逻辑还不清楚），调整环境配置
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 71 ++++++++++++++++++++---------------
1 files changed, 40 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..31cc9f9 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,65 @@
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;
- }
+ // 瑙勬牸
+ private String specs;
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
+ // 宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐
+ private Integer processSts;
}
- 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