From ed7804d6625640253b88084ddd49cc3350f8a349 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 05 七月 2024 20:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index f302516..d3150b6 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -4,7 +4,9 @@
import java.util.Date;
import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -333,6 +335,19 @@
return null;
}
+ public String getOrderType() {
+ if (Cools.isEmpty(this.orderNo)){
+ return "";
+ }
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ DocTypeService docTypeService = SpringUtils.getBean(DocTypeService.class);
+ Order order = orderService.selectByNo(orderNo, hostId);
+ if (order != null) {
+ return order.getDocType$();
+ }
+ return this.orderNo;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1