From 09b2e40a121c7ac1c5141eb788ab0de1eddb5503 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 02 八月 2025 09:08:00 +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