From 47a768eb1891f290968a00e01c97b8b56799e5cf Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Tue, 4 Jun 2024 13:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=BA=90?=
=?UTF-8?q?=E5=8F=8A=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
KanBan/NFine.Application/SRM/WatchPanelApp.cs | 31 ++++++++++++-------
.../Views/WatchPanel/PanelWIPZhiXingDa.cshtml | 9 +++---
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
index e4bf6d7..8a3c49d 100644
--- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs
+++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
@@ -1342,12 +1342,16 @@ Convert(decimal(18,1),isnull(QQ.COMQTY,0)) 完成数量,
string SqlText = "";
SqlText = @"
- select SDNCode as '发货单号' ,ArriveDate
-,case when getdate()-ArriveDate>3 then 'red' when getdate()-ArriveDate>2 and getdate()-ArriveDate<3 then 'yellow' when getdate()-ArriveDate>1 and getdate()-ArriveDate<2 then 'green' when getdate()-ArriveDate<=0 then 'white' end Status
-,cast(getdate()-ArriveDate as int) as '滞留天数'
-,case when EATTRIBUTE3='0' then '未拣配' when EATTRIBUTE3='1' then '拣配中' when EATTRIBUTE3='2' then '拣配完成' end as '状态'
-,CreatePerson as '管理员'
-from dbo.ICSSDN where Type='1' and Status<>'3' and Quantity-SDNQuantity>0 group by SDNCode,ArriveDate,EATTRIBUTE3,CreatePerson
+ select
+ a.SDNCode as '发货单号' ,ArriveDate
+,cast(getdate()-a.ArriveDate as int) as '滞留天数'
+,case when ISNULL(a.EATTRIBUTE3,'0')='0' then '未拣配' when ISNULL(a.EATTRIBUTE3,'0')='1' then '拣配中' when ISNULL(a.EATTRIBUTE3,'0')='2' then '拣配完成' end as '状态'
+,a.CreatePerson as '管理员'
+from dbo.ICSSDN a
+left join [UFDATA_001_2021].dbo.DispatchLists dls on dls.DLID = a.SDNID and dls.irowno = a.Sequence
+where a.Type='1' and a.Status<>'3' and a.Quantity-a.SDNQuantity>0
+ and a.SDNQuantity + dls.fOutQuantity <> a.Quantity
+group by a.SDNCode,a.ArriveDate,a.EATTRIBUTE3,a.CreatePerson
";
@@ -1531,12 +1535,15 @@ cast(sum(case when a.WarehouseCode='002' then a.Quantity/isnull(b.EATTRIBUTE1,1)
select count(*) as CPFH
into #Temp1
from (select
- SDNCode as '发货单号' ,ArriveDate
-,case when getdate()-ArriveDate>3 then 'red' when getdate()-ArriveDate>2 and getdate()-ArriveDate<3 then 'yellow' when getdate()-ArriveDate>1 and getdate()-ArriveDate<2 then 'green' when getdate()-ArriveDate<=0 then 'white' end Status
-,cast(getdate()-ArriveDate as int) as '滞留天数'
-,case when EATTRIBUTE3='0' then '未拣配' when EATTRIBUTE3='1' then '拣配中' when EATTRIBUTE3='2' then '拣配完成' end as '状态'
-,CreatePerson as '管理员'
-from dbo.ICSSDN where Type='1' and Status<>'3' and Quantity-SDNQuantity>0 group by SDNCode,ArriveDate,EATTRIBUTE3,CreatePerson
+ a.SDNCode as '发货单号' ,ArriveDate
+,cast(getdate()-a.ArriveDate as int) as '滞留天数'
+,case when ISNULL(a.EATTRIBUTE3,'0')='0' then '未拣配' when ISNULL(a.EATTRIBUTE3,'0')='1' then '拣配中' when ISNULL(a.EATTRIBUTE3,'0')='2' then '拣配完成' end as '状态'
+,a.CreatePerson as '管理员'
+from dbo.ICSSDN a
+left join [UFDATA_001_2021].dbo.DispatchLists dls on dls.DLID = a.SDNID and dls.irowno = a.Sequence
+where a.Type='1' and a.Status<>'3' and a.Quantity-a.SDNQuantity>0
+ and a.SDNQuantity + dls.fOutQuantity <> a.Quantity
+group by a.SDNCode,a.ArriveDate,a.EATTRIBUTE3,a.CreatePerson
)a
select count(*) as CGWDH
diff --git a/KanBan/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa.cshtml b/KanBan/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa.cshtml
index e2c7b25..122a90b 100644
--- a/KanBan/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa.cshtml
+++ b/KanBan/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa.cshtml
@@ -224,16 +224,17 @@