From 24af59685b0520fc7e642f7c2e946d4fd39c840d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 30 十月 2024 14:22:12 +0800
Subject: [PATCH] 新增物料库存报表

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 93b067b..a4e676a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -65,9 +65,9 @@
         a.founder,
         c.processing_note,
         b.customer_name,
-        if(MAX(a.layout_status)=0,'涓嶅彲鎺掔増',if(MAX(a.layout_status)=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status,
+        if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status,
         a.merge
-        from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time,merge from flow_card
+        from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,merge from flow_card
         group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
         left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
         where date(a.create_time)>=#{selectTime1} and date(a.create_time) &lt;= #{selectTime2}

--
Gitblit v1.8.0