From 08be5b93b8b78c83b16b0050134935e3b9f992dd Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期三, 15 九月 2021 11:57:57 +0800
Subject: [PATCH] 下发/重发记录，增加字段，显示发送->接收所用的秒数(时间)
---
web/web/Bin/Dao.dll | 0
web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt | 1 -
web/Model/PageBase.cs | 3 +--
web/Model/obj/Debug/Model.pdb | 0
web/App_Code/obj/Debug/App_Code.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 2 +-
web/Common/obj/Debug/Common.dll | 0
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/web/Bin/Common.dll | 0
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/UMCLib/obj/Debug/UMCLib.dll | 0
web/web/Bin/Dao.pdb | 0
web/UMCLib/bin/Debug/UMCLib.pdb | 0
web/web/Bin/App_Code.dll | 0
web/web/Bin/UMCLib.pdb | 0
web/App_Code/bin/Debug/App_Code.pdb | 0
web/Common/obj/Debug/Common.pdb | 0
web/web/Bin/Common.pdb | 0
web/web/GwSmResend.aspx | 3 +++
web/Lib/Common.dll | 0
web/App_Code/obj/Debug/App_Code.pdb | 0
web/UMCLib/obj/Debug/UMCLib.pdb | 0
web/Lib/Model.pdb | 0
web/web/GwSm.aspx | 3 +++
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 2 +-
web/Dao/obj/Debug/Dao.pdb | 0
web/Lib/Dao.dll | 0
/dev/null | 0
web/Lib/Common.pdb | 0
web/web/GwSm.ashx | 15 +++++++++++----
web/App_Code/bin/Debug/App_Code.dll | 0
web/web/Bin/Model.pdb | 0
web/.vs/Web/v16/.suo | 0
web/UMCLib/bin/Debug/UMCLib.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache | 0
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 2 +-
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
web/web/Bin/Model.dll | 0
web/Lib/Dao.pdb | 0
42 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 434dd69..de85c66 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.dll b/web/App_Code/bin/Debug/App_Code.dll
index 283c0bc..9e9a21d 100644
--- a/web/App_Code/bin/Debug/App_Code.dll
+++ b/web/App_Code/bin/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/bin/Debug/App_Code.pdb b/web/App_Code/bin/Debug/App_Code.pdb
index b288f4d..5f9d99b 100644
--- a/web/App_Code/bin/Debug/App_Code.pdb
+++ b/web/App_Code/bin/Debug/App_Code.pdb
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.dll b/web/App_Code/obj/Debug/App_Code.dll
index 283c0bc..9e9a21d 100644
--- a/web/App_Code/obj/Debug/App_Code.dll
+++ b/web/App_Code/obj/Debug/App_Code.dll
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.pdb b/web/App_Code/obj/Debug/App_Code.pdb
index b288f4d..5f9d99b 100644
--- a/web/App_Code/obj/Debug/App_Code.pdb
+++ b/web/App_Code/obj/Debug/App_Code.pdb
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
deleted file mode 100644
index bacce05..0000000
--- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
index c897d06..d2f5b82 100644
--- a/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+++ b/web/Common/obj/Debug/Common.csproj.FileListAbsolute.txt
@@ -58,4 +58,3 @@
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.dll
D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.pdb
-D:\Company\SMGW_NewWeb\web\Common\obj\Debug\Common.csproj.AssemblyReference.cache
diff --git a/web/Common/obj/Debug/Common.dll b/web/Common/obj/Debug/Common.dll
index 46ff372..3085bdb 100644
--- a/web/Common/obj/Debug/Common.dll
+++ b/web/Common/obj/Debug/Common.dll
Binary files differ
diff --git a/web/Common/obj/Debug/Common.pdb b/web/Common/obj/Debug/Common.pdb
index b76d1d6..cb03644 100644
--- a/web/Common/obj/Debug/Common.pdb
+++ b/web/Common/obj/Debug/Common.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index f5e894a..bc735c8 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index cd555c5..f171bea 100644
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -66,10 +66,10 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
+D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Lib\Dao.dll
D:\Company\SMGW_NewWeb\web\Lib\Dao.pdb
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
-D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
D:\Company\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index 1598f46..ee08796 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index 9a4da47..b7a1e91 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index 46ff372..3085bdb 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index b76d1d6..cb03644 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 1598f46..ee08796 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 9a4da47..b7a1e91 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 6f00274..3c27499 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index 2fe9bae..f7f2ccd 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/PageBase.cs b/web/Model/PageBase.cs
index ac8f746..0bf7c2b 100644
--- a/web/Model/PageBase.cs
+++ b/web/Model/PageBase.cs
@@ -1,5 +1,4 @@
-锘�
-using Common;
+锘縰sing Common;
using System;
using System.Web;
using System.Web.UI;
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
index 20506a2..f5e894a 100644
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 5fd39fe..20c8b9a 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -48,9 +48,9 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
+D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Lib\Model.dll
D:\Company\SMGW_NewWeb\web\Lib\Model.pdb
-D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.dll
D:\Company\SMGW_NewWeb\web\Model\obj\Debug\Model.pdb
diff --git a/web/Model/obj/Debug/Model.dll b/web/Model/obj/Debug/Model.dll
index 6f00274..3c27499 100644
--- a/web/Model/obj/Debug/Model.dll
+++ b/web/Model/obj/Debug/Model.dll
Binary files differ
diff --git a/web/Model/obj/Debug/Model.pdb b/web/Model/obj/Debug/Model.pdb
index 2fe9bae..f7f2ccd 100644
--- a/web/Model/obj/Debug/Model.pdb
+++ b/web/Model/obj/Debug/Model.pdb
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.dll b/web/UMCLib/bin/Debug/UMCLib.dll
index a11dbef..b53774f 100644
--- a/web/UMCLib/bin/Debug/UMCLib.dll
+++ b/web/UMCLib/bin/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/bin/Debug/UMCLib.pdb b/web/UMCLib/bin/Debug/UMCLib.pdb
index 98eb608..cd8fef4 100644
--- a/web/UMCLib/bin/Debug/UMCLib.pdb
+++ b/web/UMCLib/bin/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
index 5eb085b..f064f33 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
index 17314f8..153b3fd 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -50,8 +50,8 @@
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\UMCLib.pdb
D:\Company\SMGW_NewWeb\web\UMCLib\bin\Debug\Newtonsoft.Json.dll
-D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CoreCompileInputs.cache
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.dll
D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.pdb
+D:\Company\SMGW_NewWeb\web\UMCLib\obj\Debug\UMCLib.csproj.AssemblyReference.cache
diff --git a/web/UMCLib/obj/Debug/UMCLib.dll b/web/UMCLib/obj/Debug/UMCLib.dll
index a11dbef..b53774f 100644
--- a/web/UMCLib/obj/Debug/UMCLib.dll
+++ b/web/UMCLib/obj/Debug/UMCLib.dll
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.pdb b/web/UMCLib/obj/Debug/UMCLib.pdb
index 98eb608..cd8fef4 100644
--- a/web/UMCLib/obj/Debug/UMCLib.pdb
+++ b/web/UMCLib/obj/Debug/UMCLib.pdb
Binary files differ
diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll
index 283c0bc..9e9a21d 100644
--- a/web/web/Bin/App_Code.dll
+++ b/web/web/Bin/App_Code.dll
Binary files differ
diff --git a/web/web/Bin/App_Code.pdb b/web/web/Bin/App_Code.pdb
index b288f4d..5f9d99b 100644
--- a/web/web/Bin/App_Code.pdb
+++ b/web/web/Bin/App_Code.pdb
Binary files differ
diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll
index 46ff372..3085bdb 100644
--- a/web/web/Bin/Common.dll
+++ b/web/web/Bin/Common.dll
Binary files differ
diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb
index b76d1d6..cb03644 100644
--- a/web/web/Bin/Common.pdb
+++ b/web/web/Bin/Common.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 1598f46..ee08796 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 9a4da47..b7a1e91 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index 6f00274..3c27499 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index 2fe9bae..f7f2ccd 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb
index 98eb608..cd8fef4 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
Binary files differ
diff --git a/web/web/GwSm.ashx b/web/web/GwSm.ashx
index 832050d..e2c8e76 100644
--- a/web/web/GwSm.ashx
+++ b/web/web/GwSm.ashx
@@ -93,6 +93,7 @@
if (item.ResendStatus == 1 && item.ResendFlag == 1) { resendStatusText = "<span class='text-danger'>澶辫触鐭俊宸茶ˉ鍙�</span>"; }
if (item.ResendStatus == 1 && item.ResendFlag == 0) { resendStatusText = "<span class='text-success'>琛ュ彂璁板綍</span>"; }
str += "<td>" + resendStatusText + "</td>";
+ str += "<td>" + (item.OpDeliverTime - item.SubmitTime).TotalSeconds + "</td>";
str += "<td>" + item.APFeeCount + "/" + item.OPFeeCount + "</td>";
str += "<td>" + item.APResult + "/" + item.OPResult + "</td>";
str += @"<td class=""text-right"">" + (item.SubmitTime == DateTime.MinValue ? string.Empty : item.SubmitTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
@@ -101,7 +102,7 @@
str += @"<tr>";
str += @"<td>" + item.OPMID + "</td>";
str += @"<td><span class=""label " + css + @""">" + errorMsg + "</span></td>";
- str += @"<td colspan=""8"" class=""text-right"">" + item.MsgContent + "</td>";
+ str += @"<td colspan=""9"" class=""text-right"">" + item.MsgContent + "</td>";
str += @"<td class=""text-right text-info"">" + (item.OpDeliverTime == DateTime.MinValue ? string.Empty : item.OpDeliverTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
str += "</tr>";
}
@@ -157,15 +158,17 @@
int pageSize = context.GetInt("pageSize", 20);
int pageIndex = context.GetInt("pageIndex", 1);
- List<Model.GwSm> list = dao.LoadInfoList(selectedApMID, selectedOpName, selectedClientID, selectedSpID, selectedDestnationID, selectedDate, selectedBeginTime, selectedEndTime, selectedContent, selectedOpStat, TStatus, out recordCount, pageSize, pageIndex,"ReSend");
+ List<Model.GwSm> list = dao.LoadInfoList(selectedApMID, selectedOpName, selectedClientID, selectedSpID, selectedDestnationID, selectedDate, selectedBeginTime, selectedEndTime, selectedContent, selectedOpStat, TStatus, out recordCount, pageSize, pageIndex, "ReSend");
string str = "";
if (list != null && list.Count > 0)
{
int i = 0;
+ int j = 0;
foreach (Model.GwSm item in list)
{
+
if (item.ResendStatus == 1 && item.ResendFlag == 0)
{
i++;
@@ -188,6 +191,7 @@
if (item.ResendStatus == 1 && item.ResendFlag == 1) { resendStatusText = "<span class='text-danger'>澶辫触鐭俊宸茶ˉ鍙�</span>"; }
if (item.ResendStatus == 1 && item.ResendFlag == 0) { resendStatusText = "<span class='text-success'>琛ュ彂璁板綍</span>"; }
str += "<td>" + resendStatusText + "</td>";
+ str += "<td>" + (item.OpDeliverTime - item.SubmitTime).TotalSeconds + "</td>";
str += "<td>" + item.APFeeCount + "/" + item.OPFeeCount + "</td>";
str += "<td>" + item.APResult + "/" + item.OPResult + "</td>";
str += @"<td class=""text-right"">" + (item.SubmitTime == DateTime.MinValue ? string.Empty : item.SubmitTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
@@ -196,10 +200,13 @@
str += @"<tr>";
str += @"<td>" + item.OPMID + "</td>";
str += @"<td><span class=""label " + css + @""">" + errorMsg + "</span></td>";
- str += @"<td colspan=""8"" class=""text-right"">" + item.MsgContent + "</td>";
+ str += @"<td colspan=""9"" class=""text-right"">" + item.MsgContent + "</td>";
str += @"<td class=""text-right text-info"">" + (item.OpDeliverTime == DateTime.MinValue ? string.Empty : item.OpDeliverTime.ToString("yy-MM-dd HH:mm:ss")) + "</td>";
str += "</tr>";
- }
+ }//琛ュ彂鐘舵�佹樉绀�
+
+
+
}
}
else
diff --git a/web/web/GwSm.aspx b/web/web/GwSm.aspx
index 3ddaa49..38d6034 100644
--- a/web/web/GwSm.aspx
+++ b/web/web/GwSm.aspx
@@ -204,6 +204,9 @@
琛ュ彂鐘舵��
</th>
<th>
+ 鑰楁椂/绉�
+ </th>
+ <th>
<a data-original-title="AP璁¤垂/OP璁¤垂" type="button" class="btn-xs" data-toggle="tooltip"
data-placement="top" title="">璁¤垂</a>
</th>
diff --git a/web/web/GwSmResend.aspx b/web/web/GwSmResend.aspx
index 3c697e9..c1f7736 100644
--- a/web/web/GwSmResend.aspx
+++ b/web/web/GwSmResend.aspx
@@ -204,6 +204,9 @@
琛ュ彂鐘舵��
</th>
<th>
+ 鑰楁椂/绉�
+ </th>
+ <th>
<a data-original-title="AP璁¤垂/OP璁¤垂" type="button" class="btn-xs" data-toggle="tooltip"
data-placement="top" title="">璁¤垂</a>
</th>
--
Gitblit v1.9.1