From 9ee2abf3f34b3e6c0d35df6cdde0c4d4e1a5d246 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 31 十二月 2021 20:16:08 +0800
Subject: [PATCH] 问题处理
---
WebSRM/WebSRM.csproj | 5 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 26 ++++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 4
WebSRM/App_Data/ReportData.cs | 88 ++++++++++++++++++---
WebSRM/App_Data/MssqlReportData.cs | 31 +++++++
WebSRM/App_Data/LogService.cs | 71 +++++++++++++++++
6 files changed, 197 insertions(+), 28 deletions(-)
diff --git a/WebSRM/App_Data/LogService.cs b/WebSRM/App_Data/LogService.cs
new file mode 100644
index 0000000..90a7c0b
--- /dev/null
+++ b/WebSRM/App_Data/LogService.cs
@@ -0,0 +1,71 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+public class LogService
+{
+ private static readonly object lockObj = new object();
+
+ public static void WriteAsync(object obj, string filePath = "Vlog", bool isAppend = true)
+ {
+ Task.Run(() =>
+ {
+ Write(obj, filePath, isAppend);
+ });
+ }
+
+ public static void WriteAsync<T>(object obj, string filePath = "Vlog", bool isAppend = true)
+ {
+ Task.Run(() =>
+ {
+ Write(obj, $@"{filePath}\{typeof(T).Name}", isAppend);
+ });
+ }
+
+ #region 鏃ュ織
+ public static void Write(object obj, string filePath = "Vlog", bool isAppend = true)
+ {
+ try
+ {
+ lock (lockObj)
+ {
+ filePath = $@"{filePath}\webapi{DateTime.Now.ToString("yyyyMMdd")}.txt";
+
+ filePath = AppDomain.CurrentDomain.BaseDirectory + filePath;
+
+ if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
+ {
+ System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+ }
+
+ bool fileExists = System.IO.File.Exists(filePath);
+ //涓嶅瓨鍦� 鍒欏垱寤鸿鏂囦欢
+ if (!fileExists)
+ {
+ System.IO.File.Create(filePath).Close();
+ }
+
+ using (StreamWriter writer = new StreamWriter(filePath, isAppend))
+ {
+ //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+ if (fileExists && isAppend)
+ {
+ writer.WriteLine();
+ }
+
+ var content = obj is string ? obj : JsonConvert.SerializeObject(obj);
+ writer.WriteLine($"{DateTime.Now} {content}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+ #endregion
+}
+
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index 41e34c9..9b2b746 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -14,9 +14,11 @@
//杩炴帴SQL Server鏁版嵁搴撶殑杩炴帴涓诧紝搴旇淇敼涓轰笌瀹為檯涓�鑷淬�傚鏋滄槸杩愯Grid++Report鏈韩鐨勪緥瀛愶紝搴旇棣栧厛闄勫姞渚嬪瓙鏁版嵁搴撳埌
//SQL Server2000/2005鏁版嵁搴撲笂銆�
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
- // public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//澶忓疂
- public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //瀹夌憺
+ //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
//public string sDataBase;
@@ -72,12 +74,37 @@
//鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鎴� JSON 鏁版嵁
protected static void DoGenDetailData(System.Web.UI.Page DataPage, string QuerySQL, ResponseDataType DataType, bool IsJSON)
{
+ LogService.Write(QuerySQL);
+ //SqlConnection conn = new SqlConnection(SqlConnStr);
+ //try
+ //{
+ // conn.Open();
+ // LogService.Write("Connection opened.");
+ // LogService.Write("Connection Properties:");
+ // LogService.Write("Connection String:{0}", conn.ConnectionString);
+ // LogService.Write("Database:{0}", conn.Database);
+ // LogService.Write("DataSource:{0}", conn.DataSource);
+ // LogService.Write("ServerVersion:{0}", conn.ServerVersion);
+ // LogService.Write("State:{0}", conn.State.ToString());
+ // LogService.Write("WorkstationId:{0}", conn.WorkstationId);
+ //}
+ //catch (SqlException e)
+ //{
+ // LogService.Write("Error: " + e);
+ //}
+ //finally
+ //{
+ // conn.Close();
+ // LogService.Write("Connection close.");
+ //}
SqlConnection ReportConn = new SqlConnection(SqlConnStr);
SqlDataAdapter ReportDataAdapter = new SqlDataAdapter(QuerySQL, ReportConn);
DataSet ReportDataSet = new DataSet();
ReportConn.Open();
+ LogService.Write("State:" + ReportConn.State);
ReportDataAdapter.Fill(ReportDataSet);
ReportConn.Close();
+ LogService.Write("hangshu :" + ReportDataSet.Tables[0].Rows.Count);
if (IsJSON)
JSONReportData.GenDataSet(DataPage, ReportDataSet, DataType);
diff --git a/WebSRM/App_Data/ReportData.cs b/WebSRM/App_Data/ReportData.cs
index 90d9ec9..48d9bfc 100644
--- a/WebSRM/App_Data/ReportData.cs
+++ b/WebSRM/App_Data/ReportData.cs
@@ -2,15 +2,11 @@
//using System.Collections;
using System.Text;
using System.Data;
-using System.Configuration;
using System.IO;
using System.IO.Compression;
using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
-using System.Web.UI.HtmlControls;
+using System.Threading.Tasks;
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
//浠ヤ笅鏋氫妇鎸囧畾鎶ヨ〃鏁版嵁鐨勬牸寮忕被鍨�
@@ -165,7 +161,7 @@
{
//"recordset":[
sbJSONText.Append('"');
- sbJSONText.Append(dt.TableName);
+ sbJSONText.Append(dt.TableName);
sbJSONText.Append("\":[\n");
foreach (DataRow dr in dt.Rows)
{
@@ -203,7 +199,7 @@
public static void PrepareValueText(ref string ValueText)
{
bool HasSpecialChar = false;
- foreach(char ch in ValueText)
+ foreach (char ch in ValueText)
{
if (ch == '"' || ch == '\\' || ch == '\r' || ch == '\n' || ch == '\t')
{
@@ -218,22 +214,84 @@
{
if (ch == '"' || ch == '\\' || ch == '\r' || ch == '\n' || ch == '\t')
{
- NewValueText.Append( '\\');
+ NewValueText.Append('\\');
if (ch == '"' || ch == '\\')
- NewValueText.Append( ch );
+ NewValueText.Append(ch);
else if (ch == '\r')
- NewValueText.Append( 'r' );
+ NewValueText.Append('r');
else if (ch == '\n')
- NewValueText.Append( 'n' );
+ NewValueText.Append('n');
else if (ch == '\t')
- NewValueText.Append( 't' );
+ NewValueText.Append('t');
}
else
{
- NewValueText.Append( ch );
+ NewValueText.Append(ch);
}
}
ValueText = NewValueText.ToString();
}
}
-}
\ No newline at end of file
+}
+//public class LogService
+//{
+// private static readonly object lockObj = new object();
+
+// public static void WriteAsync(object obj, string filePath = "Vlog", bool isAppend = true)
+// {
+// Task.Run(() =>
+// {
+// Write(obj, filePath, isAppend);
+// });
+// }
+
+// public static void WriteAsync<T>(object obj, string filePath = "Vlog", bool isAppend = true)
+// {
+// Task.Run(() =>
+// {
+// Write(obj, $@"{filePath}\{typeof(T).Name}", isAppend);
+// });
+// }
+
+// #region 鏃ュ織
+// public static void Write(object obj, string filePath = "Vlog", bool isAppend = true)
+// {
+// try
+// {
+// lock (lockObj)
+// {
+// filePath = $@"{filePath}\webapi{DateTime.Now.ToString("yyyyMMdd")}.txt";
+
+// filePath = AppDomain.CurrentDomain.BaseDirectory + filePath;
+
+// if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
+// {
+// System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+// }
+
+// bool fileExists = System.IO.File.Exists(filePath);
+// //涓嶅瓨鍦� 鍒欏垱寤鸿鏂囦欢
+// if (!fileExists)
+// {
+// System.IO.File.Create(filePath).Close();
+// }
+
+// using (StreamWriter writer = new StreamWriter(filePath, isAppend))
+// {
+// //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+// if (fileExists && isAppend)
+// {
+// writer.WriteLine();
+// }
+
+// var content = obj is string ? obj : obj;
+// writer.WriteLine($"{DateTime.Now} {content}");
+// }
+// }
+// }
+// catch (Exception ex)
+// {
+// }
+// }
+// #endregion
+//}
\ No newline at end of file
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 93b6208..b82ccc8 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -102,6 +102,10 @@
<HintPath>..\packages\Microsoft.AspNet.Membership.OpenAuth.2.0.1\lib\net45\Microsoft.AspNet.Membership.OpenAuth.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\鍔炲叕\K3Cloud\WebSite\bin\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -954,6 +958,7 @@
<ItemGroup>
<Compile Include="App_Data\Class1.cs" />
<Compile Include="App_Data\JScript.cs" />
+ <Compile Include="App_Data\LogService.cs" />
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="App_Data\StringUtil.cs" />
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 725f864..40eaa76 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -569,8 +569,8 @@
, where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 8878f03..b2d3042 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -51,6 +51,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">閫佽揣鍗曞彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
@@ -106,15 +112,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-filter="">
- <option value="">鍏ㄩ儴</option>
- <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
- <option value="宸叉墦鍗�">宸叉墦鍗�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
+ <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">閲囪喘缁勭粐</label>
@@ -536,6 +542,8 @@
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+ if ($("#HBillNoFrom").val() != "")
+ sqlWhere += " and 婧愬崟鍗曞彿 like ^^%" + $("#HBillNoFrom").val() + "%^^";
if ($("#HInnerBillNo").val() != "")
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
if ($("#HShortNumber").val() != "")
--
Gitblit v1.9.1