From 1dd9711a1741362564737fd34749a7324dd30aad Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 七月 2025 15:31:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f7a2c91..32e1cc8 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -357,7 +357,7 @@
private String remark;
//搴撳瓨鐘舵��
- private Integer cstateid;
+ private String cstateid;
public OrderDetl() {
}
@@ -610,6 +610,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -624,6 +625,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -709,6 +711,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