From 055743022694b6fc1bb1864137e0c81b6ea658c5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 29 一月 2026 19:45:26 +0800
Subject: [PATCH] 盘点出库增加一个标记    可筛选可清除

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e689cb4..1516e40 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -610,7 +610,6 @@
                         && this.boxType1.equals(orderDetl.getBoxType1())
                         && this.boxType2.equals(orderDetl.getBoxType2())
                         && this.boxType3.equals(orderDetl.getBoxType3())
-                        && this.cstateid.equals(orderDetl.getCstateid())
         );
     }
 
@@ -625,7 +624,6 @@
                         && this.boxType1.equals(orderDetl.getBoxType1())
                         && this.boxType2.equals(orderDetl.getBoxType2())
                         && this.boxType3.equals(orderDetl.getBoxType3())
-                        && this.cstateid.equals(orderDetl.getCstateid())
         );
     }
 
@@ -711,6 +709,15 @@
         return String.valueOf(this.cstateid);
     }
 
+    public String getCstateidVcode() {
+        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+        if (!Cools.isEmpty(kcztMap)){
+            return String.valueOf(kcztMap.getVcode());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1