From 1664adb595a7539325f46a85ee7e80e4023e4302 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:15:31 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 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 62ae6b4..2a7b05a 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,6 +1,5 @@
 package com.zy.asrs.entity.param;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -18,12 +17,14 @@
     private String barcode;
 
     // 搴撲綅缂栧彿
-    private String locno;
+    private String locNo;
 
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
+
+        private String orderNo;
 
         // 鐗╂枡缂栧彿
         private String matnr = "";
@@ -31,18 +32,28 @@
         // 搴忓垪鐮�
         private String batch = "";
         private String brand = "";
-        private String standby1 = "";
-        private String standby2 = "";
-        private String standby3 = "";
+        private String standby1 = "1";
+        private String standby2 = "1";
+        private String standby3 = "1";
+
+        private String boxType1 = "1";
+        private String boxType2 = "1";
+        private String boxType3 = "1";
 
         // 鐗╂枡鏁伴噺
         private Double anfme;
 
         // 鍟嗗搧鍚嶇О
-        private String maktx;
+        private String maktx = "";
 
         // 瑙勬牸
-        private String specs;
+        private String specs = "";
+        private String supp = "";
+
+        // sku
+        private String sku = "";
+        //澶囨敞
+        private String memo = "";
 
     }
 

--
Gitblit v1.9.1