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 | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 581e76b..32e1cc8 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,10 +7,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.StoreTypeService;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -358,6 +356,9 @@
@TableField("remark")
private String remark;
+ //搴撳瓨鐘舵��
+ private String cstateid;
+
public OrderDetl() {
}
@@ -565,8 +566,9 @@
}
public Double getEnableQty() {
+
if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+ return MathUtils.subtract(this.anfme, this.workQty);
}
// if (null != this.anfme && this.qty != null) {
// return this.anfme - this.qty;
@@ -608,6 +610,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -622,6 +625,7 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
+ && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -698,6 +702,24 @@
return this.boxType1;
}
+ public String getCstateid$() {
+ 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.getVname());
+ }
+ 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