From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后,wms订单跟着删除功能 3.新增订单完成后,上报erp,erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 84a4927..00c3844 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,15 +16,39 @@
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locno;
+
+    //婧愮珯鐐�
+    private String rsta;
+
+    //澶у皬鎵樼洏
+    private String barcodeSize;
+
+    private String ck;
+
+    private boolean type = false;
+
+
+    //agv鐘舵��
+    /**
+     * 0锛氭棤闇�璋冪敤AGV
+     * 1锛氱瓑寰呰皟鐢ˋGV
+     * 2锛欰GV浠诲姟涓嬪彂鎴愬姛
+     * 3锛欰GV浠诲姟瀹屾垚
+     * 4锛氱粰杈撻�佺嚎涓嬪彂鍏ュ簱鎸囦护
+     */
+    private Integer beBatch = 0;
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
-
+        private String bc;
         // 鐗╂枡缂栧彿
         private String matnr;
 
-        // 搴忓垪鐮�
+        // 鎵瑰彿
         private String batch;
 
         // 鐗╂枡鏁伴噺

--
Gitblit v1.9.1