From 88e6db11cf5c11e9f85c0a9f9a6c76b6e2ed61bf Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 四月 2026 13:05:12 +0800
Subject: [PATCH] 1.数字孪生--近期订单（默认7天）优化
---
src/main/resources/mapper/ViewDigitalTwinMapper.xml | 15 +++++----------
src/main/java/com/zy/asrs/entity/LocMast.java | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index c401304..239377e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -179,7 +179,7 @@
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "搴撲綅绫诲瀷锛�1.鏁ｈ揣 2.鏁存澘 3.绌烘墭鐩� ")
@TableField("ctn_no")
private String ctnNo;
diff --git a/src/main/resources/mapper/ViewDigitalTwinMapper.xml b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
index c02e427..15f8554 100644
--- a/src/main/resources/mapper/ViewDigitalTwinMapper.xml
+++ b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
@@ -45,16 +45,11 @@
COUNT(*) as orderNum
FROM (
SELECT
- CAST(order_time AS DATE) as orderDate
- FROM man_order_pakin
- WHERE order_time BETWEEN #{startTime} AND #{endTime}
-
- UNION ALL
-
- SELECT
- CAST(order_time AS DATE) as orderDate
- FROM man_order_pakout
- WHERE order_time BETWEEN #{startTime} AND #{endTime}
+ CAST(io_time AS DATE) as orderDate
+ FROM asr_wrk_mast_log
+ WHERE io_time BETWEEN #{startTime} AND #{endTime}
+ AND user_no IS NOT NULL
+ AND LTRIM(RTRIM(user_no)) <> ''
) combined
GROUP BY orderDate
ORDER BY orderDate
--
Gitblit v1.9.1