From 3495df4f340b2027dbe6c2d5ab40b91cc11dec5f Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期六, 26 七月 2025 12:49:04 +0800
Subject: [PATCH] 1
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 11
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 8
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
APSM/APSM.csproj.user | 6
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44 +-
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 5
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 331 +++++++++++++++++++++++
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 203 ++++++++++++--
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs | 2
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs | 69 ++++
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs | 2
WebAPI/Models/HBarCodeList.cs | 1
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
/dev/null | 0
WebAPI/Controllers/SCGL/日计划管理/Xs_SendGoodsPlanBillController.cs | 52 ---
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 13
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WebAPI/Models/HSouceOrderList.cs | 1
WebAPI/Controllers/品质管理/车间自检单/QC_WorkSelfCheckBillController.cs | 40 ++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/华远datamapping/QC_CheckNote_PNL_TempController.cs | 4
31 files changed, 664 insertions(+), 129 deletions(-)
diff --git a/APSM/APSM.csproj.user b/APSM/APSM.csproj.user
new file mode 100644
index 0000000..c10e84b
--- /dev/null
+++ b/APSM/APSM.csproj.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectView>ProjectFiles</ProjectView>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 3b0e987..4eed82e 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 0f7e827..abd5f74 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index 67abecf..45ba7df 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 452c6e8..3e96669 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 6d0bdab..f21d16b 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index cf9ca59..5a3c3a7 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 5dafd86..26739be 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index 64b1564..b80d319 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index a7e7f70..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 75e66e8..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index f43116c..a84a65c 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,14 +3,3 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index a7e7f70..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 75e66e8..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
deleted file mode 100644
index e5dc9b8..0000000
--- a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index bfb772c..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
deleted file mode 100644
index 97979d2..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
deleted file mode 100644
index 9a5be6e..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
deleted file mode 100644
index 310ad83..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index b5249f2..e38ab25 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -1240,5 +1240,336 @@
#endregion
+
+
+ #region 瀹濆伐锛氭棩鐢熶骇璁″垝 鏂囦欢涓婁紶
+ [Route("JIT_DayPlanPlatForm_DayImport/JIT_DayPlanPlatForm_DayImport_DR")]
+ [HttpPost]
+ public object JIT_DayPlanPlatForm_DayImport_DR()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //灏嗗鍏ユ枃浠朵腑鐨勫垪娣诲姞鍒皌b2涓�
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HWorkShopID", typeof(Int32)); //鐢熶骇杞﹂棿
+ tb2.Columns.Add("鐢熶骇杞﹂棿缂栫爜*", typeof(string)); //鏃ヨ鍒掑崟鎹富鍐呯爜
+
+ tb2.Columns.Add("hmainid", typeof(Int32)); //鏃ヨ鍒掑崟鎹富鍐呯爜
+ tb2.Columns.Add("鍗曟嵁鍙�", typeof(string)); //鏃ヨ鍒掑崟鍙�
+ tb2.Columns.Add("HSourceID", typeof(Int32)); //鐢熶骇璧勬簮id
+
+ tb2.Columns.Add("ICMOBillHInterID", typeof(Int32)); //鐢熶骇璁㈠崟涓籭d
+ tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32)); //鐢熶骇璁㈠崟瀛恑d
+ tb2.Columns.Add("HMaterID", typeof(Int32)); //鐗╂枡ID
+
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ oSystemParameter.ShowBill(ref Ret);
+
+ //灏嗗鍏ユ枃浠朵腑鐨勬暟鎹坊鍔犲埌tb2涓�
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ //濡傛灉琛ㄦ牸绗琲琛岀殑绗竴鍒椾负绌猴紝鍒欏垽鏂负杩欎竴琛岀殑鏁版嵁涓虹┖锛岃烦鍑哄惊鐜苟涓斾笉鎶婃暟鎹啓鍏� tb2
+ if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
+ {
+ continue;
+ }
+ else
+ {
+ tb2.Rows.Add(row);
+ }
+ }
+
+ var error = "";
+ var ErrorResult = "";
+
+ //鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ //鍒ゆ柇瀵煎叆鏂囦欢涓紝蹇呭～椤圭洰鏄惁濉啓
+ //if (tb2.Rows[i]["缁勭粐缂栫爜*"].ToString() == "")
+ // error += "缁勭粐缂栫爜涓嶈兘涓虹┖;";
+ //if (tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString() == "")
+ // error += "鐢熶骇杞﹂棿缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;\n";
+ if (tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString() == "")
+ error += "鐢熶骇璁㈠崟鏄庣粏琛屽彿涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() == "")
+ error += "鐗╂枡缂栫爜涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString() == "")
+ error += "鐢熶骇璧勬簮缂栫爜涓嶈兘涓虹┖;";
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀵煎叆鏂囦欢涓殑鐢熶骇璁㈠崟鏄惁瀛樺湪
+ string sql1 = "";
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ {
+ sql1 = "select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='" + tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString() + "' and 浜у搧浠ｇ爜='" + tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString() + "' and 鏄庣粏琛屽彿=" + tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ }
+ else
+ {
+ sql1 = string.Format("select * from h_v_JIT_ICMOBillList_DR where 鍗曟嵁鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鏄庣粏琛屽彿={2} ",
+ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString(), tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString());
+ }
+ ds = oCN.RunProcReturn(sql1, "h_v_JIT_ICMOBillList_DR");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ error += $"娌℃湁鐢熶骇璁㈠崟淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()}" +
+ $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}";
+ }
+
+ //鑻ョ敓浜ц鍗曞瓨鍦紝鑾峰彇鐢熶骇璁㈠崟淇℃伅
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString(); //鐢熶骇杞﹂棿鍐呯爜
+ tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"] = ds.Tables[0].Rows[0]["鐢熶骇杞﹂棿浠ｇ爜"].ToString(); //鐢熶骇杞﹂棿鍐呯爜
+
+ tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString(); //鐢熶骇璁㈠崟涓籭d
+ tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString(); //鐢熶骇璁㈠崟瀛恑d
+ tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
+ tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString();
+ tb2.Rows[i]["鐗╂枡鍚嶇О"] = ds.Tables[0].Rows[0]["浜у搧鍚嶇О"].ToString();
+ tb2.Rows[i]["瑙勬牸鍨嬪彿"] = ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ }
+
+
+ //鑾峰彇宸ュ崟鎺掍骇淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_JIT_WorkBillSortBillList_DR " +
+ $"where 鐢熶骇璁㈠崟鍙�='{tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()}' and 鐢熶骇璁㈠崟鏄庣粏琛屽彿='{tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()}' " +
+ $"and 鐗╂枡浠ｇ爜='{tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}' " +
+ $"and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}' ", "h_v_JIT_WorkBillSortBillList_DR");
+ //缁勭粐缂栫爜='{tb2.Rows[i]["缁勭粐缂栫爜*"].ToString()}' and
+ //and 鐢熶骇璧勬簮缂栫爜='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["hmainid"] = ds.Tables[0].Rows[0]["hmainid"].ToString();
+ tb2.Rows[i]["鍗曟嵁鍙�"] = ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString();
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
+ }
+ else
+ {
+ error += $"娌℃湁鎺掍骇淇℃伅锛岀敓浜ц鍗曞彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鍙�*"].ToString()},鐢熶骇杞﹂棿缂栫爜:{tb2.Rows[i]["鐢熶骇杞﹂棿缂栫爜*"].ToString()}" +
+ $",鐢熶骇璁㈠崟鏄庣粏琛屽彿:{ tb2.Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString()},鐗╂枡缂栫爜:{ tb2.Rows[i]["鐗╂枡缂栫爜*"].ToString()}" +
+ $",鐢熶骇璧勬簮缂栫爜:{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}";
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ErrorResult;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹濆伐锛氭棩鐢熶骇璁″垝 瀵煎叆(淇濆瓨)
+ [Route("JIT_DayPlanPlatForm_DayImport/JIT_DayPlanPlatForm_DayImport_btnSave")]
+ [HttpPost]
+ public object JIT_DayPlanPlatForm_DayImport_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain_DayImport(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain_DayImport(string msg1)
+ {
+ string err = "";
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //璺濅粖澶╁線鍚庡彲璁剧疆鐨勫ぉ鏁�
+ string msg3 = sArray[1].ToString(); //琛ㄦ牸鏁版嵁
+ string user = sArray[2].ToString(); //鐢ㄦ埛
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ var HInterID = list[i]["hmainid"].ToString();
+ var HBillNo = list[i]["鍗曟嵁鍙�"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HSourceNumber = list[i]["鐢熶骇璧勬簮缂栫爜*"].ToString();
+ var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
+ var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�*"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿*"].ToString();
+ var HMaterID = list[i]["HMaterID"].ToString();
+ var HMaterNumber = list[i]["鐗╂枡缂栫爜*"].ToString();
+ var HMaterName = list[i]["鐗╂枡鍚嶇О"].ToString();
+ var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
+
+
+ // 缁熻鎬诲ぉ鏁�
+ HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
+ foreach (var key in list[i].Keys)
+ {
+ if (DateTime.TryParseExact(key, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date))
+ {
+ uniqueDates.Add(date);
+ }
+ }
+ int SumDay = uniqueDates.Count; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+
+ foreach(var date in uniqueDates)
+ {
+ //涓昏〃瀛愯〃閮芥湁鏁版嵁
+ if (list[i][date.ToString("yyyy-MM-dd")].ToString() != "")
+ {
+ int HQty = int.Parse(list[i][date.ToString("yyyy-MM-dd")].ToString());
+
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub_DayImport(HInterID, HBillNo, date, HQty);
+ if (objJsonResult.code == "0")
+ {
+ err += "銆愮敓浜ц鍗曪細" + HICMOBillNo + "锛涜鍙凤細" + HICMOEntrySEQ + "锛涚墿鏂欑紪鐮侊細" + HMaterNumber + "锛涚墿鏂欏悕绉帮細" + HMaterName + "锛涚敓浜ц祫婧愮紪鐮侊細" + HSourceNumber + "锛涙棩鏈燂細" + date.ToString("yyyy-MM-dd") + "锛涙暟閲忥細" + HQty + "銆戯細" + objJsonResult.Message + "锛�";
+ }
+ }
+ }
+ }
+
+ if (err.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = err;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub_DayImport(string HInterID, string HBillNo, DateTime date, int HQTY)
+ {
+ //灏嗘棩璁″垝宸ュ崟涓鏃ユ湡鐨勮褰曚綔搴�
+ string sql_delete = "update Sc_WorkBillSortBillSub set HDeleteFlag = 1 where HInterID = " + HInterID + " and convert(varchar(100),HMasterDate,23) = '" + date.ToString("yyyy-MM-dd") + "'";
+ oCN.RunProc(sql_delete);
+
+ //灏嗗鍏ョ殑鏁版嵁鐢熸垚璇ユ棩璁″垝宸ュ崟鎸囧畾鏃ユ湡鐨勮褰�
+ string sql_insert = "insert into Sc_WorkBillSortBillSub(HInterID,HSEQ,HMasterDate,HQty,HDayImportFlag) " +
+ "values(" +
+ "" + HInterID + "" +
+ "," + 0 + "" +
+ ",'" + date.ToString("yyyy-MM-dd") + "'" +
+ "," + HQTY + "" +
+ "," + 1 + "" +
+ ")";
+
+ oCN.RunProc(sql_insert);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
index 00a6ed8..53ec03c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
@@ -332,6 +332,14 @@
}
oCN.Commit();//缁撴潫浜嬪姟
}
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁涓嶅瓨鍦�,鏃犳硶鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -339,50 +347,8 @@
objJsonResult.data = null;
return objJsonResult;
- //else if (DataType == 2)
- //{
- // var NumData = HInterID.Split(',');
- // //鑾峰彇绯荤粺鍙傛暟
- // string sReturn = "";
- // oSystemParameter.ShowBill(ref sReturn);
-
- // for (int i = 0; i < NumData.Length; i++)
- // {
-
- // ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");
-
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // if (ds.Tables[0].Rows[0]["鍗曟嵁鐘舵��"].ToString() != "1")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "褰撳墠鍗曟嵁涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // oCN.BeginTran();//寮�鍚簨鍔�
-
- // oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData[i]}");
-
- // oCN.Commit();//缁撴潫浜嬪姟
- // }
-
- // }
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鍗曟嵁涓嶅瓨鍦�,鏃犳硶鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
+
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs b/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
index c5cd285..dd303ad 100644
--- a/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs
@@ -652,7 +652,7 @@
//鍒犻櫎鍏宠仈
oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_UnCheck " + HInterID + ",'" + CurUserName + "'");
- if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.AbandonCheck(oCN,oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
oCN.Commit();
objJsonResult.code = "1";
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
index 172c721..50ddd72 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
@@ -1,5 +1,6 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -162,6 +163,74 @@
}
#endregion
+ #region 鍑哄叆搴撳崟鎹潯鐮佹槑缁� 璁剧疆鏁版嵁
+ class BarCodeDetailSaveData
+ {
+ public long HInterID;
+ public string HBillNo;
+ public string HBillType;
+ public string HBarCode;
+ public double HMaterialJQty;
+ public double HWeight_TL;
+ public double HWeight_CP;
+ }
+
+ [Route("Kf_ICStockInOutBill/Kf_BarCodeDetailQuery_saveData")]
+ [HttpPost]
+ public json Kf_BarCodeDetailQuery_saveData([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //瀛愯〃鏁版嵁
+ string user = sArray[1].ToString();
+
+ msg2 = msg2.ToString();
+ List<BarCodeDetailSaveData> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BarCodeDetailSaveData>>(msg2);
+
+ oCN.BeginTran();
+ foreach (BarCodeDetailSaveData oSub in mainList)
+ {
+ long HInterID = oSub.HInterID;
+ string HBillNo = oSub.HBillNo;
+ string HBillType = oSub.HBillType;
+ string HBarCode = oSub.HBarCode;
+ double HMaterialJQty = oSub.HMaterialJQty;
+ double HWeight_TL = oSub.HWeight_TL;
+ double HWeight_CP = oSub.HWeight_CP;
+
+ string sql = "update Kf_ICStockBillSub_WMS set " +
+ "HMaterialJQty = " + HMaterialJQty + "" +
+ ",HWeight_TL = " + HWeight_TL + "" +
+ ",HWeight_CP = " + HWeight_CP + "" +
+ "where HInterID = " + HInterID + " " +
+ "and HBillNo = '" + HBillNo + "' " +
+ "and HBillType = '" + HBillType + "' " +
+ "and HBarCode = '" + HBarCode + "' ";
+ oCN.RunProc(sql);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ #endregion
#region 鏉＄爜鍑哄叆搴撶紦瀛�
#region 鏉＄爜鍑哄叆搴撶紦瀛樺垪琛�
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 10d3ae3..423f9d1 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1697,6 +1697,7 @@
barcode.HCusModel2 = ordrlist[i].HCusModel;
barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
ListRows.Add(barcode);
n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
@@ -1801,6 +1802,7 @@
barcode.HCusModel2 = ordrlist[i].HCusModel;
barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
ListRows.Add(barcode);
n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
@@ -1905,6 +1907,7 @@
barcode.HCusModel2 = ordrlist[i].HCusModel;
barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
+ barcode.HZZRQ = ordrlist[i].HZZRQ;
ListRows.Add(barcode);
n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
@@ -1975,6 +1978,7 @@
string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
+ string HZZRQ = ClsPub.isStrNull(ListRows[i].HZZRQ);
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -1983,7 +1987,7 @@
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
- ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HZZRQ " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1993,7 +1997,7 @@
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
- + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
+ + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HZZRQ + "'" + ")");
}
}
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index 2b3bf08..30f6587 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -64,7 +64,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -146,7 +146,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -192,7 +192,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -238,7 +238,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -286,6 +286,10 @@
[HttpGet]
public VRSInner_savePNLBarCodePosition_RequestResult VRSInner_savePNLBarCodePosition(string HBarCode_PNL,double HPNLPosition_x,double HPNLPosition_y)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰鎻愬彇涓婁紶PNL浜岀淮鐮佷綅缃��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "锛汬PNLPosition_x锛�" + HPNLPosition_x + "锛汬PNLPosition_y" + HPNLPosition_y + "銆�");
+
VRSInner_savePNLBarCodePosition_RequestResult result = new VRSInner_savePNLBarCodePosition_RequestResult();
try
{
@@ -301,6 +305,8 @@
{
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
else
@@ -314,12 +320,16 @@
result.code = "1";
result.msg = "涓婁紶鎴愬姛";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
{
result.code = "0";
result.msg = "" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -330,6 +340,10 @@
[HttpGet]
public VRSInner_getPNLBarCodePosition_RequestResult VRSInner_getPNLBarCodePosition(string HBarCode_PNL)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "銆�");
+
VRSInner_getPNLBarCodePosition_RequestResult result = new VRSInner_getPNLBarCodePosition_RequestResult();
List<VRSInner_getPNLBarCodePosition_RequestResult_data> dataList = new List<VRSInner_getPNLBarCodePosition_RequestResult_data>();
try
@@ -346,6 +360,8 @@
result.code = "0";
result.msg = "PNL浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠PNL浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -361,6 +377,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -368,6 +386,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -378,6 +398,10 @@
[HttpPost]
public VRSInner_saveCheckNote_RequestResult VRSInner_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
VRSInner_saveCheckNote_RequestResult result = new VRSInner_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -400,7 +424,7 @@
int HPosition_x = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐐．VRS鍐呭眰";
- int HPageIndex = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = vRSInner_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
@@ -430,7 +454,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -444,6 +468,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -451,6 +477,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -461,6 +489,10 @@
[HttpGet]
public VRSOuter_saveSetBarCodePosition_RequestResult VRSOuter_saveSetBarCodePosition(string HBarCode_Set, double HSetPosition_x, double HSetPosition_y)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鎻愬彇涓婁紶set浜岀淮鐮佷綅缃��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_Set锛�" + HBarCode_Set + "锛汬SetPosition_x锛�" + HSetPosition_x + "锛汬SetPosition_y" + HSetPosition_y + "銆�");
+
VRSOuter_saveSetBarCodePosition_RequestResult result = new VRSOuter_saveSetBarCodePosition_RequestResult();
try
{
@@ -482,6 +514,8 @@
{
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
else
@@ -502,12 +536,16 @@
result.code = "1";
result.msg = "涓婁紶鎴愬姛";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
{
result.code = "0";
result.msg = "" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -518,6 +556,10 @@
[HttpGet]
public VRSOuter_getSetBarCodePosition_RequestResult VRSOuter_getSetBarCodePosition(string HBarCode_Set)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鑾峰彇Set浜岀淮鐮佷綅缃俊鎭��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_Set锛�" + HBarCode_Set + "銆�");
+
VRSOuter_getSetBarCodePosition_RequestResult result = new VRSOuter_getSetBarCodePosition_RequestResult();
List<VRSOuter_getSetBarCodePosition_RequestResult_data> dataList = new List<VRSOuter_getSetBarCodePosition_RequestResult_data>();
try
@@ -540,6 +582,8 @@
result.code = "0";
result.msg = "Set浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠Set浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -555,6 +599,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -562,6 +608,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -575,17 +623,37 @@
/// <returns></returns>
[Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
[HttpGet]
- public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
+ public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker, string HBatchNo)
{
try
{
- ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢宠PNL鏉＄爜銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘LayOutName锛�" + HLayOutName + "锛汬Maker:" + HMaker + "銆�");
+
+ string sql_checkPNLInfo = "select * from Gy_PNLInfo where HLayOutName = '" + HLayOutName + "'";
+ DataSet ds_checkPNLInfo = oCN.RunProcReturn(sql_checkPNLInfo, "Gy_PNLInfo");
+ if (ds_checkPNLInfo == null || ds_checkPNLInfo.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏂欏彿瀵瑰簲鐨凙OI鏈淮鎶わ紒锛�";
+ objJsonResult.data = null;
+
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "','" + HBatchNo + "'" , "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍐欏叆鑾峰彇PNL鏉＄爜鏃跺彂鐢熼敊璇紒";
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
@@ -594,6 +662,8 @@
objJsonResult.count = 0; //澶辫触锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else
@@ -602,6 +672,8 @@
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = ds.Tables[0].Rows[0]["HBarCode"].ToString();
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -611,6 +683,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鐢宠PNL鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -622,6 +696,10 @@
[HttpGet]
public VRSOuter_getDataMapping_RequestResult VRSOuter_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鑾峰彇datamapping淇℃伅銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
VRSOuter_getDataMapping_RequestResult result = new VRSOuter_getDataMapping_RequestResult();
List<VRSOuter_getDataMapping_RequestResult_data> dataList = new List<VRSOuter_getDataMapping_RequestResult_data>();
try
@@ -646,6 +724,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -653,6 +733,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -663,6 +745,10 @@
[HttpPost]
public VRSOuter_saveCheckNote_RequestResult VRSOuter_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
VRSOuter_saveCheckNote_RequestResult result = new VRSOuter_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -685,7 +771,7 @@
int HPosition_x = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐐．VRS澶栧眰";
- int HPageIndex = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
@@ -715,7 +801,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -729,6 +815,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -736,6 +824,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -751,6 +841,10 @@
[HttpGet]
public object VRSOuter_getBarCodeBill_SET(string HBarCode_PNL, string HMaker)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鐢宠set鏉＄爜銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "锛汬Maker:" + HMaker + "銆�");
+
try
{
ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_Set_Temp_Insert '" + HBarCode_PNL + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_Set_Temp_Insert");
@@ -760,6 +854,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍐欏叆鑾峰彇SET鏉＄爜鏃跺彂鐢熼敊璇紒";
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
@@ -768,6 +864,8 @@
objJsonResult.count = 0; //澶辫触锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else
@@ -782,6 +880,8 @@
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = HBarCodeList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -791,6 +891,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鐢宠SET鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -802,6 +904,10 @@
[HttpGet]
public AVI_getDataMapping_RequestResult AVI_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("AVI鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
AVI_getDataMapping_RequestResult result = new AVI_getDataMapping_RequestResult();
List<AVI_getDataMapping_RequestResult_data> dataList = new List<AVI_getDataMapping_RequestResult_data>();
try
@@ -822,6 +928,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -850,6 +958,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -857,6 +967,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -867,6 +979,10 @@
[HttpPost]
public AVI_saveCheckNote_RequestResult AVI_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("AVI妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
AVI_saveCheckNote_RequestResult result = new AVI_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -884,42 +1000,35 @@
for (int j = 0; j < aVI_SaveCheckNote_RequestParams[i].param.Count; j++)
{
string HBarCode = aVI_SaveCheckNote_RequestParams[i].param[j].HBarCode;
- string HSetNo = "";
+ string HBarCode_PNL = "";
+ string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
string HPCSNo = aVI_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
int HPosition_x = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "AVI";
- int HPageIndex = aVI_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = aVI_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = aVI_SaveCheckNote_RequestParams[i].param[j].HBadReason;
- //鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
- string sql_set = "" +
- "select distinct " +
- " b.HSetNo " +
- "from Gy_PNLInfo as a " +
- "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
- "where a.HLayOutName in " +
- " ( " +
- " select HLayOutName from Gy_BarCodeBill_PNL_Temp where HBarCode = '" + HBarCode + "' " +
- //" union " +
- //" select HLayOutName from Gy_BarCodeBill_PNL_His where HBarCode = '" + HBarCode + "' " +
- " ) " +
- "and b.HPCSNo = '" + HPCSNo + "' ";
- ds = oCN.RunProcReturn(sql_set, "Gy_PNLInfo");
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
- HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
"values(" +
- "'" + HBarCode + "'" +
+ "'" + HBarCode_PNL + "'" +
",'" + HSetNo + "'" +
",'" + HPCSNo + "'" +
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -933,6 +1042,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -940,6 +1051,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -950,6 +1063,10 @@
[HttpGet]
public DC_getDataMapping_RequestResult DC_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢垫祴鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
DC_getDataMapping_RequestResult result = new DC_getDataMapping_RequestResult();
List<DC_getDataMapping_RequestResult_data> dataList = new List<DC_getDataMapping_RequestResult_data>();
try
@@ -970,6 +1087,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -998,6 +1117,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1005,6 +1126,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -1015,6 +1138,10 @@
[HttpPost]
public DC_saveCheckNote_RequestResult DC_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢垫祴妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
DC_saveCheckNote_RequestResult result = new DC_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -1038,7 +1165,7 @@
int HPosition_x = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐢垫祴";
- int HPageIndex = dC_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = dC_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = dC_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
@@ -1060,7 +1187,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -1074,6 +1201,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1081,6 +1210,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -1091,6 +1222,10 @@
[HttpGet]
public JGG_getDataMapping_RequestResult JGG_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("婵�鍏夊壊鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
JGG_getDataMapping_RequestResult result = new JGG_getDataMapping_RequestResult();
List<JGG_getDataMapping_RequestResult_data> dataList = new List<JGG_getDataMapping_RequestResult_data>();
try
@@ -1111,6 +1246,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -1139,6 +1276,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1146,6 +1285,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
index 97d8875..503d5b1 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/QC_CheckNote_PNL_TempController.cs"
@@ -142,7 +142,7 @@
int HPosition_x = list[0].HPosition_x;
int HPosition_y = list[0].HPosition_y;
string HCheckProc = list[0].HCheckProc;
- short HPageIndex = list[0].HPageIndex;
+ string HPageIndex = list[0].HPageIndex;
string HBadReason = list[0].HBadReason;
string HMaker = list[0].HMaker;
DateTime HMakeDate = list[0].HMakeDate;
@@ -362,7 +362,7 @@
int HPosition_x = list[0].HPosition_x;
int HPosition_y = list[0].HPosition_y;
string HCheckProc = list[0].HCheckProc;
- short HPageIndex = list[0].HPageIndex;
+ string HPageIndex = list[0].HPageIndex;
string HBadReason = list[0].HBadReason;
string HMaker = list[0].HMaker;
DateTime HMakeDate = list[0].HMakeDate;
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
index b31da58..8ebd954 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillController.cs"
@@ -323,7 +323,26 @@
}
else
{
+ if (BillOld.ShowBill(mainList[0].HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
}
//鎻愮ず
if (bResult == true)
@@ -516,7 +535,7 @@
oBill.MvarItemKey = "QC_WorkSelfCheckBillMain";
//閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
- if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ if (oBill.ShowBill(long.Parse(HInterID), ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
{
if (oBill.omodel.HCloseMan.Trim() != "")
{
@@ -1017,7 +1036,24 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ var s = "";
+ if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙垹闄�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//寮�濮嬩簨鐗�
oCN.BeginTran();
diff --git a/WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs b/WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs
index b401cba..cccfa28 100644
--- a/WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs
+++ b/WebAPI/Models/ClsQC_CheckNote_PNL_Temp.cs
@@ -14,7 +14,7 @@
public int HPosition_x {set; get;}
public int HPosition_y {set; get;}
public string HCheckProc {set; get;}
- public short HPageIndex {set; get;}
+ public string HPageIndex {set; get;}
public string HBadReason {set; get;}
public string HMaker {set; get;}
public DateTime HMakeDate { set; get; }
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
index 4e29306..4647ac4 100644
--- a/WebAPI/Models/HBarCodeList.cs
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -77,6 +77,7 @@
public string HCusModel2 { get; set; } //"瀹㈡埛鐗╂枡瑙勬牸";
public string HCusMaterName2 { get; set; } //"瀹㈡埛鐗╂枡鍚嶇О";
public string HCheckEmpName2 { get; set; } //"妫�楠屽憳鍚嶇О";
+ public string HZZRQ { get; set; } //鍒堕�犳棩鏈�
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
index 5ffb466..4d93a89 100644
--- a/WebAPI/Models/HSouceOrderList.cs
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -79,5 +79,6 @@
public string HCusModel { get; set; } //"瀹㈡埛鐗╂枡瑙勬牸";
public string HCusMaterName { get; set; } //"瀹㈡埛鐗╂枡鍚嶇О";
public string HCheckEmpName { get; set; } //"妫�楠屽憳鍚嶇О";
+ public string HZZRQ { get; set; } //鍒堕�犳棩鏈�
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index d5601c1..664e71b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-07-10T07:32:46.2125476Z;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-07-18T06:36:12.8758873Z;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/10/2025 15:32:23</publishTime>
+ <publishTime>07/18/2025 14:34:19</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/10/2025 15:32:23</publishTime>
+ <publishTime>07/18/2025 14:34:19</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/10/2025 15:32:20</publishTime>
+ <publishTime>07/18/2025 14:34:16</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/10/2025 15:32:20</publishTime>
+ <publishTime>07/18/2025 14:34:16</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/10/2025 15:32:13</publishTime>
+ <publishTime>07/18/2025 14:34:09</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/10/2025 15:32:13</publishTime>
+ <publishTime>07/18/2025 14:34:09</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/10/2025 15:32:14</publishTime>
+ <publishTime>07/18/2025 14:34:10</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/10/2025 15:32:14</publishTime>
+ <publishTime>07/18/2025 14:34:10</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/10/2025 15:32:10</publishTime>
+ <publishTime>07/18/2025 14:34:06</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/10/2025 15:32:10</publishTime>
+ <publishTime>07/18/2025 14:34:06</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/10/2025 15:32:11</publishTime>
+ <publishTime>07/18/2025 14:34:07</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/10/2025 15:32:11</publishTime>
+ <publishTime>07/18/2025 14:34:07</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/10/2025 15:32:12</publishTime>
+ <publishTime>07/18/2025 14:34:07</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/10/2025 15:32:12</publishTime>
+ <publishTime>07/18/2025 14:34:07</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>07/10/2025 15:32:07</publishTime>
+ <publishTime>07/18/2025 14:34:02</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>07/10/2025 15:32:07</publishTime>
+ <publishTime>07/18/2025 14:34:02</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>07/10/2025 15:32:14</publishTime>
+ <publishTime>07/18/2025 14:34:10</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>07/10/2025 15:32:14</publishTime>
+ <publishTime>07/18/2025 14:34:10</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/10/2025 15:32:32</publishTime>
+ <publishTime>07/18/2025 14:34:29</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/10/2025 15:32:32</publishTime>
+ <publishTime>07/18/2025 14:34:29</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/10/2025 15:32:43</publishTime>
+ <publishTime>07/18/2025 14:34:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0e4e2c3..defdc4e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -451,6 +451,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index f2fb83b..7a78930 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -19,6 +19,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
+ <ProjectView>ShowAllFiles</ProjectView>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index b4d1a01..b3a6f35 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 72f4d7d..cdbf68a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,17 +1,6 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index b3a6f35..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index f67032a..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
deleted file mode 100644
index 935c951..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
deleted file mode 100644
index ad58389..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1