From 6deef5b408b08add4ad38314e37d7c6a38d4b031 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期四, 09 九月 2021 17:24:00 +0800
Subject: [PATCH] 优化自动补发开关，不显示具体补发通道，显示通道时，显示通道ID+通道名，优化补发记录表显示问题
---
web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt | 10 +++
web/Common/obj/Debug/Common.csproj.AssemblyReference.cache | 0
web/Model/obj/Debug/Model.pdb | 0
web/App_Code/obj/Debug/App_Code.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt | 8 ++
web/Dao/obj/Debug/Dao.dll | 0
web/Model/obj/Debug/Model.dll | 0
web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache | 2
web/.vs/Web/config/applicationhost.config | 2
web/Dao/GwSmDao.cs | 13 +++-
web/App_Code/bin/Debug/App_Code.pdb | 0
web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/obj/Debug/Dao.pdb | 0
web/Lib/Dao.dll | 0
web/App_Code/bin/Debug/App_Code.dll | 0
web/.vs/Web/v16/.suo | 0
web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache | 0
web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
web/Lib/Dao.pdb | 0
web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache | 0
web/web/Bin/Dao.dll | 0
web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache | 2
web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache | 2
web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache | 0
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
web/UMCLib/obj/Debug/UMCLib.dll | 0
web/web/Bin/Dao.pdb | 0
web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache | 2
web/UMCLib/bin/Debug/UMCLib.pdb | 0
web/web/Bin/App_Code.dll | 0
web/web/Bin/UMCLib.pdb | 0
web/App_Code/obj/Debug/App_Code.pdb | 0
web/UMCLib/obj/Debug/UMCLib.pdb | 0
web/Lib/Model.pdb | 0
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 7 ++
web/web/GwSp.ashx | 3
web/web/gwspupdate.aspx | 5 +
/dev/null | 0
web/web/GwSm.ashx | 2
web/web/Bin/Model.pdb | 0
web/web/GwOpGroup.aspx | 4
web/web/logs/logx.txt | 44 ++++++++++++++
web/UMCLib/bin/Debug/UMCLib.dll | 0
web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt | 7 ++
web/web/logs/err.txt | 44 ++++++++++++++
web/web/Bin/Model.dll | 0
51 files changed, 143 insertions(+), 14 deletions(-)
diff --git a/web/.vs/Web/config/applicationhost.config b/web/.vs/Web/config/applicationhost.config
index 88fe2ce..3a3a971 100644
--- a/web/.vs/Web/config/applicationhost.config
+++ b/web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@
</site>
<site name="web" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\web" />
+ <virtualDirectory path="/" physicalPath="D:\Company\SMGW_NewWeb\web\web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:60960:localhost" />
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index ef7ba5d..8150ccf 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 fa10016..060c581 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 de5595d..4b129b2 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.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
index 2132e1a..6347609 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
index b2aa535..933dd95 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e7fb51b1833512b8e90548af426f6763d797b4f8
+73d59a519d75fba02045f94dbe09df43d113619d
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
index e318f9b..5697626 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
+++ b/web/App_Code/obj/Debug/App_Code.csproj.FileListAbsolute.txt
@@ -57,3 +57,13 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\App_Code\obj\Debug\App_Code.pdb
+D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.dll
+D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\App_Code.pdb
+D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Aspose.Cells.dll
+D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Dao.dll
+D:\Company\SMGW_NewWeb\web\App_Code\bin\Debug\Ionic.Zip.dll
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.AssemblyReference.cache
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CoreCompileInputs.cache
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.csproj.CopyComplete
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.dll
+D:\Company\SMGW_NewWeb\web\App_Code\obj\Debug\App_Code.pdb
diff --git a/web/App_Code/obj/Debug/App_Code.dll b/web/App_Code/obj/Debug/App_Code.dll
index fa10016..060c581 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 de5595d..4b129b2 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/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index a0da3a7..fb4e382 100644
--- a/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/App_Code/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
index a31702c..af1e7e8 100644
--- a/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
+++ b/web/Common/obj/Debug/Common.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index e3ce15b..77d2276 100644
--- a/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Dao/GwSmDao.cs b/web/Dao/GwSmDao.cs
index 14b7cc3..2cce7b0 100644
--- a/web/Dao/GwSmDao.cs
+++ b/web/Dao/GwSmDao.cs
@@ -323,7 +323,7 @@
/// <param name="pageSize"></param>
/// <param name="pageIndex"></param>
/// <returns></returns>
- public List<GwSm> LoadInfoList(string apMID, string opName, string clientID, string spID, string destnationId, string sDate, string beginTime, string endTime, string content, string opstat, int TStatus, out int recordcount, int pageSize, int pageIndex)
+ public List<GwSm> LoadInfoList(string apMID, string opName, string clientID, string spID, string destnationId, string sDate, string beginTime, string endTime, string content, string opstat, int TStatus, out int recordcount, int pageSize, int pageIndex,string ReSend=null)
{
List<GwSm> list1 = new List<GwSm>();
recordcount = 0;
@@ -331,8 +331,15 @@
{
string str = sDate.Replace("-", "");
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 ");
- List<OracleParameter> list2 = new List<OracleParameter>();
+ if (ReSend == "ReSend")
+ {
+ stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 and ResendStatus = 1 and ResendFlag = 0 ");
+ }
+ else
+ {
+ stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 ");
+ }
+ List<OracleParameter> list2 = new List<OracleParameter>();
if (apMID != null && apMID != "")
{
OracleParameter oracleParameter = new OracleParameter(":ApMID", (OracleDbType)126);
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index 102d9e6..b2c8377 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.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index 80bc74c..a8f9bfc 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d73caa8eb865873d8d000d2031e4a931de8cbd56
+688a409b7c30ea29e7eead193b0ae1f8a1d53978
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index 5726244..d41cabf 100644
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -59,3 +59,10 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Dao\obj\Debug\Dao.pdb
+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 6100b11..61fb75f 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 f4e978e..0acf3a3 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 675b0b1..d3bed3f 100644
--- a/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Dao/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/build.force b/web/Dao/obj/Debug/build.force
deleted file mode 100644
index e69de29..0000000
--- a/web/Dao/obj/Debug/build.force
+++ /dev/null
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 6100b11..61fb75f 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 f4e978e..0acf3a3 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 eb5b638..ccc936e 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 d8263aa..6fadfab 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 2743635..8dd191b 100644
--- a/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
index 795c8a8..61e361d 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.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index 8fa486e..12e2b6a 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-09dd05148f9283f925d778d0f350ab6575172786
+aebac79719274e095c2969da297537aa0c829db4
diff --git a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index 676df84..6f30d40 100644
--- a/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/web/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -41,3 +41,10 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Model\obj\Debug\Model.pdb
+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.AssemblyReference.cache
+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 eb5b638..ccc936e 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 d8263aa..6fadfab 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 136af61..6b92569 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 a744fcf..99c4aaa 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/DesignTimeResolveAssemblyReferencesInput.cache b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6109698..54616eb 100644
--- a/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/web/UMCLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.AssemblyReference.cache
index ed4c322..2d66f07 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.CoreCompileInputs.cache b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
index aabc2eb..40c0a9e 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e71e443ae8532619f86855b075450b837bd7ca99
+c546f08e5171d2ea11491af4c442ff223c9bb58c
diff --git a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
index 2dfeb07..17314f8 100644
--- a/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
+++ b/web/UMCLib/obj/Debug/UMCLib.csproj.FileListAbsolute.txt
@@ -47,3 +47,11 @@
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.csproj.CopyComplete
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.dll
C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\UMCLib\obj\Debug\UMCLib.pdb
+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
diff --git a/web/UMCLib/obj/Debug/UMCLib.dll b/web/UMCLib/obj/Debug/UMCLib.dll
index 136af61..6b92569 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 a744fcf..99c4aaa 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 271ea84..060c581 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 fc68233..4b129b2 100644
--- a/web/web/Bin/App_Code.pdb
+++ b/web/web/Bin/App_Code.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 6100b11..61fb75f 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 f4e978e..0acf3a3 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 eb5b638..ccc936e 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 d8263aa..6fadfab 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 4cb514c..99c4aaa 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
Binary files differ
diff --git a/web/web/GwOpGroup.aspx b/web/web/GwOpGroup.aspx
index bca5113..7753afc 100644
--- a/web/web/GwOpGroup.aspx
+++ b/web/web/GwOpGroup.aspx
@@ -46,7 +46,7 @@
<div class="form-group">
<table class="table table-striped table-bordered table-hover" id="opList">
<thead>
- <tr><th class="col-md-6">閫氶亾</th><th class="col-md-4">鏉冮噸</th><th class="col-md-2">鎿嶄綔</th></tr>
+ <tr><th class="col-md-6">閫氶亾</th><th class="col-md-4">鏉冮噸</th><th class="col-md-2">鎿嶄綔</th></tr>
</thead>
<tbody>
@@ -92,7 +92,7 @@
html.push("<tr>");
html.push("<td><select class='form-control' name='opid'>");
$.each(opList, function (i) {
- html.push("<option value='" + this.OpID + "' "+((this.OpID == opid) ? "selected" : "")+">" + this.OpName + "</option>");
+ html.push("<option value='" + this.OpID + "' "+((this.OpID == opid) ? "selected" : "")+">" +this.OpID+"-"+ this.OpName + "</option>");
});
html.push("</select></td>");
html.push("<td><input type='text' class='form-control' name='weight' value='"+weight+"'></td>");
diff --git a/web/web/GwSm.ashx b/web/web/GwSm.ashx
index c0df96a..832050d 100644
--- a/web/web/GwSm.ashx
+++ b/web/web/GwSm.ashx
@@ -157,7 +157,7 @@
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);
+ List<Model.GwSm> list = dao.LoadInfoList(selectedApMID, selectedOpName, selectedClientID, selectedSpID, selectedDestnationID, selectedDate, selectedBeginTime, selectedEndTime, selectedContent, selectedOpStat, TStatus, out recordCount, pageSize, pageIndex,"ReSend");
string str = "";
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 01faf1f..8dc0a8b 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -315,7 +315,8 @@
if (gwSp.RESEND_STATUS == 1)
{
str1 += "<td rowspan=\"1\"><div class=\"btn btn-primary btn-xs\">鍚敤澶辫触琛ュ彂</div>";
- str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(gwSp.RESEND_CM_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CU_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CT_GROUPID));
+ //str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(gwSp.RESEND_CM_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CU_GROUPID), (object)this.GetGroupName(gwSp.RESEND_CT_GROUPID));
+ //璐︽埛椤甸潰鏄剧ず琛ュ彂閫氶亾鍏蜂綋鐨勯�氶亾
}
else
{
diff --git a/web/web/gwspupdate.aspx b/web/web/gwspupdate.aspx
index 22e861a..a941127 100644
--- a/web/web/gwspupdate.aspx
+++ b/web/web/gwspupdate.aspx
@@ -960,7 +960,8 @@
</select><span class="highlight"></span>寮�鍚嚜鍔ㄨˉ鍙戝姛鑳斤紝澶辫触鐨勫彿鐮佷細鑷姩浠庡凡閰嶇疆鐨勫け璐ヨˉ鍙戦�氶亾鍙戦�佷竴娆�
</td>
</tr>
- <tr style="display: none;" id="control_resendContent">
+ <!--鑷姩琛ュ彂閫氶亾缁勯厤缃樉绀�-->
+ <%-- <tr style="display: none;" id="control_resendContent">
<th>
閫氶亾缁勪俊鎭細
</th>
@@ -988,7 +989,7 @@
</select></div>
</div>
</td>
- </tr>
+ </tr>--%>
<!-- 鑷姩琛ュ彂閰嶇疆-end -->
<tr>
diff --git a/web/web/logs/err.txt b/web/web/logs/err.txt
index eaf8683..8c71894 100644
--- a/web/web/logs/err.txt
+++ b/web/web/logs/err.txt
@@ -535,3 +535,47 @@
Process ID: 7904
Session ID: 6 Serial number: 11866
+#6 2021-09-03 11:07:11,651 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#6 2021-09-03 11:07:17,336 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#9 2021-09-03 11:07:17,644 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#9 2021-09-03 11:07:18,930 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#6 2021-09-03 11:07:24,386 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#6 2021-09-03 11:08:09,005 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210902 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210902 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#7 2021-09-03 11:08:45,659 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#7 2021-09-03 11:09:27,156 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1 from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend)
+
diff --git a/web/web/logs/logx.txt b/web/web/logs/logx.txt
index eaf8683..8c71894 100644
--- a/web/web/logs/logx.txt
+++ b/web/web/logs/logx.txt
@@ -535,3 +535,47 @@
Process ID: 7904
Session ID: 6 Serial number: 11866
+#6 2021-09-03 11:07:11,651 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#6 2021-09-03 11:07:17,336 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#9 2021-09-03 11:07:17,644 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#9 2021-09-03 11:07:18,930 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#6 2021-09-03 11:07:24,386 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#6 2021-09-03 11:08:09,005 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210902 sm left join GW_OP op on sm.op_id=op.op_id where 1=1from LG_SM_20210902 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 408
+
+#7 2021-09-03 11:08:45,659 Common.dll OracleHelper.ExecuteReader ORA-00933: SQL 命令未正确结束
+ 在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+ 在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 219
+
+#7 2021-09-03 11:09:27,156 Dao.dll GwSmDao.LoadInfoList ORA-00933: SQL 命令未正确结束select count(*) as count from LG_SM_20210903 sm left join GW_OP op on sm.op_id=op.op_id where 1=1 from LG_SM_20210903 and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME
+ 在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
+ 在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend)
+
--
Gitblit v1.9.1