From e62c6b670ee27f5d4e01498d4acaf14a88fcf302 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 13:17:45 +0800
Subject: [PATCH] 合并分支
---
DAL/bin/x86/Release/DAL.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.dll | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/DBUtility.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/bin/x86/Release/Pub_Control.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache | 2
Model/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
Model/bin/x86/Release/SQLHelper.pdb | 0
Model/bin/x86/Release/SQLHelper.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/Model.dll | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/x86/Release/Model.dll | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.pdb | 0
Model/bin/x86/Release/Model.pdb | 0
DAL/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 457 ++++++++++++++++++++++++++++++++++++-
DAL/bin/x86/Release/Pub_Class.pdb | 0
Pub_Class/bin/x86/Release/Pub_Class.dll | 0
DAL/bin/x86/Release/Pub_Class.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache | 2
BLL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/Pub_Control.dll | 0
BLL/bin/x86/Release/DAL.dll | 0
SQLHelper/bin/x86/Release/Pub_Class.pdb | 0
Pub_Class/bin/x86/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.dll | 0
Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt | 15 +
DBUtility/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/x86/Release/Pub_Class.dll | 0
WebAPI/Controllers/XSGL/Xs_SellOutBillList_SecController.cs | 56 ++++
Pub_Class/bin/x86/Release/SyntacticSugar.pdb | 0
BLL/bin/x86/Release/TopSdk.dll | 0
DBUtility/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/DAL.pdb | 0
BLL/bin/x86/Release/TopSdk.pdb | 0
Pub_Class/bin/x86/Release/SyntacticSugar.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
BLL/bin/x86/Release/BLL.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/DBUtility.dll | 0
WebAPI/Controllers/QC_ManagementController.cs | 4
BLL/bin/Release/SQLHelper.dll | 0
BLL/bin/x86/Release/BLL.dll | 0
Model/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 4
Model/bin/Release/SQLHelper.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 46 +-
Pub_Control/bin/x86/Release/Pub_Control.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt | 9
SQLHelper/obj/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/Model.dll | 0
BLL/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/DBUtility.dll | 0
DAL/bin/x86/Release/Model.pdb | 0
Model/obj/x86/Release/Model.dll | 0
Model/bin/x86/Release/Pub_Class.dll | 0
BLL/bin/x86/Release/DBUtility.pdb | 0
DAL/bin/x86/Release/DBUtility.pdb | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBill_TKController.cs | 27 ++
Model/obj/x86/Release/Model.pdb | 0
DAL/bin/x86/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44 +-
Model/bin/x86/Release/DBUtility.dll | 0
DBUtility/bin/x86/Release/Pub_Control.pdb | 0
DBUtility/bin/x86/Release/SQLHelper.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.pdb | 0
DAL/bin/x86/Release/Pub_Control.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/bin/x86/Release/DBUtility.pdb | 0
DBUtility/bin/x86/Release/Pub_Control.dll | 0
DBUtility/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/SQLHelper.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 1
Pub_Control/bin/x86/Release/Pub_Class.dll | 0
/dev/null | 4
Model/bin/Release/SQLHelper.dll | 0
Pub_Control/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/DAL.pdb | 0
97 files changed, 599 insertions(+), 72 deletions(-)
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.dll b/BLL/bin/x86/Release/BLL.dll
index 705d367..bfbf17d 100644
--- a/BLL/bin/x86/Release/BLL.dll
+++ b/BLL/bin/x86/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.pdb b/BLL/bin/x86/Release/BLL.pdb
index 00c4b22..f5fcef0 100644
--- a/BLL/bin/x86/Release/BLL.pdb
+++ b/BLL/bin/x86/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.dll b/BLL/bin/x86/Release/DAL.dll
index 8c56b3f..5b211ec 100644
--- a/BLL/bin/x86/Release/DAL.dll
+++ b/BLL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.pdb b/BLL/bin/x86/Release/DAL.pdb
index 1aee0ce..b7680c6 100644
--- a/BLL/bin/x86/Release/DAL.pdb
+++ b/BLL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.dll b/BLL/bin/x86/Release/DBUtility.dll
index 54e1bbd..9512725 100644
--- a/BLL/bin/x86/Release/DBUtility.dll
+++ b/BLL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.pdb b/BLL/bin/x86/Release/DBUtility.pdb
index 5b542b9..735b019 100644
--- a/BLL/bin/x86/Release/DBUtility.pdb
+++ b/BLL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.dll b/BLL/bin/x86/Release/Model.dll
index 16ae200..fcdec9a 100644
--- a/BLL/bin/x86/Release/Model.dll
+++ b/BLL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.pdb b/BLL/bin/x86/Release/Model.pdb
index 7f5534a..402f9b3 100644
--- a/BLL/bin/x86/Release/Model.pdb
+++ b/BLL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.dll b/BLL/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/BLL/bin/x86/Release/Pub_Class.dll
+++ b/BLL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.pdb b/BLL/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/BLL/bin/x86/Release/Pub_Class.pdb
+++ b/BLL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.dll b/BLL/bin/x86/Release/Pub_Control.dll
index 179de79..c1a3637 100644
--- a/BLL/bin/x86/Release/Pub_Control.dll
+++ b/BLL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.pdb b/BLL/bin/x86/Release/Pub_Control.pdb
index 3b103ba..26f72ac 100644
--- a/BLL/bin/x86/Release/Pub_Control.pdb
+++ b/BLL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.dll b/BLL/bin/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/BLL/bin/x86/Release/SQLHelper.dll
+++ b/BLL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.pdb b/BLL/bin/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/BLL/bin/x86/Release/SQLHelper.pdb
+++ b/BLL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/TopSdk.dll b/BLL/bin/x86/Release/TopSdk.dll
new file mode 100644
index 0000000..59e7811
--- /dev/null
+++ b/BLL/bin/x86/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/BLL/bin/x86/Release/TopSdk.pdb
similarity index 100%
rename from sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
rename to BLL/bin/x86/Release/TopSdk.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.dll b/DAL/bin/x86/Release/DAL.dll
index 8c56b3f..5b211ec 100644
--- a/DAL/bin/x86/Release/DAL.dll
+++ b/DAL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.pdb b/DAL/bin/x86/Release/DAL.pdb
index 1aee0ce..b7680c6 100644
--- a/DAL/bin/x86/Release/DAL.pdb
+++ b/DAL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.dll b/DAL/bin/x86/Release/DBUtility.dll
index 54e1bbd..9512725 100644
--- a/DAL/bin/x86/Release/DBUtility.dll
+++ b/DAL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.pdb b/DAL/bin/x86/Release/DBUtility.pdb
index 5b542b9..735b019 100644
--- a/DAL/bin/x86/Release/DBUtility.pdb
+++ b/DAL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.dll b/DAL/bin/x86/Release/Model.dll
index 16ae200..fcdec9a 100644
--- a/DAL/bin/x86/Release/Model.dll
+++ b/DAL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.pdb b/DAL/bin/x86/Release/Model.pdb
index 7f5534a..402f9b3 100644
--- a/DAL/bin/x86/Release/Model.pdb
+++ b/DAL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.dll b/DAL/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/DAL/bin/x86/Release/Pub_Class.dll
+++ b/DAL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.pdb b/DAL/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/DAL/bin/x86/Release/Pub_Class.pdb
+++ b/DAL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.dll b/DAL/bin/x86/Release/Pub_Control.dll
index 179de79..c1a3637 100644
--- a/DAL/bin/x86/Release/Pub_Control.dll
+++ b/DAL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.pdb b/DAL/bin/x86/Release/Pub_Control.pdb
index 3b103ba..26f72ac 100644
--- a/DAL/bin/x86/Release/Pub_Control.pdb
+++ b/DAL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.dll b/DAL/bin/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/DAL/bin/x86/Release/SQLHelper.dll
+++ b/DAL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.pdb b/DAL/bin/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/DAL/bin/x86/Release/SQLHelper.pdb
+++ b/DAL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.dll b/DBUtility/bin/x86/Release/DBUtility.dll
index 54e1bbd..9512725 100644
--- a/DBUtility/bin/x86/Release/DBUtility.dll
+++ b/DBUtility/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.pdb b/DBUtility/bin/x86/Release/DBUtility.pdb
index 5b542b9..735b019 100644
--- a/DBUtility/bin/x86/Release/DBUtility.pdb
+++ b/DBUtility/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.dll b/DBUtility/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.dll
+++ b/DBUtility/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.pdb b/DBUtility/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/DBUtility/bin/x86/Release/Pub_Class.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.dll b/DBUtility/bin/x86/Release/Pub_Control.dll
index 179de79..c1a3637 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.dll
+++ b/DBUtility/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.pdb b/DBUtility/bin/x86/Release/Pub_Control.pdb
index 3b103ba..26f72ac 100644
--- a/DBUtility/bin/x86/Release/Pub_Control.pdb
+++ b/DBUtility/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.dll b/DBUtility/bin/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.dll
+++ b/DBUtility/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.pdb b/DBUtility/bin/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/DBUtility/bin/x86/Release/SQLHelper.pdb
+++ b/DBUtility/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.dll b/Model/bin/x86/Release/DBUtility.dll
index 54e1bbd..9512725 100644
--- a/Model/bin/x86/Release/DBUtility.dll
+++ b/Model/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.pdb b/Model/bin/x86/Release/DBUtility.pdb
index 5b542b9..735b019 100644
--- a/Model/bin/x86/Release/DBUtility.pdb
+++ b/Model/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Model.dll b/Model/bin/x86/Release/Model.dll
index 16ae200..fcdec9a 100644
--- a/Model/bin/x86/Release/Model.dll
+++ b/Model/bin/x86/Release/Model.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Model.pdb b/Model/bin/x86/Release/Model.pdb
index 7f5534a..402f9b3 100644
--- a/Model/bin/x86/Release/Model.pdb
+++ b/Model/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.dll b/Model/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/Model/bin/x86/Release/Pub_Class.dll
+++ b/Model/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.pdb b/Model/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/Model/bin/x86/Release/Pub_Class.pdb
+++ b/Model/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.dll b/Model/bin/x86/Release/Pub_Control.dll
index 179de79..c1a3637 100644
--- a/Model/bin/x86/Release/Pub_Control.dll
+++ b/Model/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.pdb b/Model/bin/x86/Release/Pub_Control.pdb
index 3b103ba..26f72ac 100644
--- a/Model/bin/x86/Release/Pub_Control.pdb
+++ b/Model/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.dll b/Model/bin/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/Model/bin/x86/Release/SQLHelper.dll
+++ b/Model/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.pdb b/Model/bin/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/Model/bin/x86/Release/SQLHelper.pdb
+++ b/Model/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index d3669ce..e6e73e4 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/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
index 372b3e0..df04ab4 100644
--- a/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
+++ b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf1de7c5db7452fbe8feec75166c542ccdbc3c25
+8cff70c790e796f956039e7b524ea3be46f8106b
diff --git a/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt b/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
index 466dfe1..35ace40 100644
--- a/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
+++ b/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
@@ -13,3 +13,18 @@
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.dll
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Model.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Model.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\DBUtility.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Class.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\SQLHelper.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Control.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\DBUtility.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Class.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\SQLHelper.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\bin\x86\Release\Pub_Control.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\Model\obj\x86\Release\Model.pdb
diff --git a/Model/obj/x86/Release/Model.dll b/Model/obj/x86/Release/Model.dll
index 16ae200..fcdec9a 100644
--- a/Model/obj/x86/Release/Model.dll
+++ b/Model/obj/x86/Release/Model.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.pdb b/Model/obj/x86/Release/Model.pdb
index 7f5534a..402f9b3 100644
--- a/Model/obj/x86/Release/Model.pdb
+++ b/Model/obj/x86/Release/Model.pdb
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.dll b/Pub_Class/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Class/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.pdb b/Pub_Class/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/Pub_Class/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/SyntacticSugar.csproj.AssemblyReference.cache b/Pub_Class/bin/x86/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/Pub_Class/bin/x86/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/Pub_Class/bin/x86/Release/SyntacticSugar.dll
similarity index 100%
rename from SyntacticSugar/obj/Debug/SyntacticSugar.dll
rename to Pub_Class/bin/x86/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/Pub_Class/bin/x86/Release/SyntacticSugar.pdb
similarity index 100%
rename from SyntacticSugar/obj/Debug/SyntacticSugar.pdb
rename to Pub_Class/bin/x86/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.dll b/Pub_Control/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.pdb b/Pub_Control/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/Pub_Control/bin/x86/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.dll b/Pub_Control/bin/x86/Release/Pub_Control.dll
index 179de79..c1a3637 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.dll
+++ b/Pub_Control/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.pdb b/Pub_Control/bin/x86/Release/Pub_Control.pdb
index 3b103ba..26f72ac 100644
--- a/Pub_Control/bin/x86/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.dll b/SQLHelper/bin/x86/Release/Pub_Class.dll
index 72bd727..ed4783e 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.dll
+++ b/SQLHelper/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.pdb b/SQLHelper/bin/x86/Release/Pub_Class.pdb
index 71c5b7f..fca5b65 100644
--- a/SQLHelper/bin/x86/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.dll b/SQLHelper/bin/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.dll
+++ b/SQLHelper/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.pdb b/SQLHelper/bin/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/SQLHelper/bin/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 5fe7ae7..9571a4a 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/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index db0a8d1..9b0ba9d 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 17bbc05..ea2434d 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
index 2c3a1b8..a8eff7d 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/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
index c3910bc..7d10f6b 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e8ec5326fcce7dca1a8665f7df1eeeb575e7a0a1
+6e8752cea1563effc4e21d288e42a2d4215b13f8
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt b/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
index d10c2c4..4f2b71d 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
@@ -7,3 +7,12 @@
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll
D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.dll b/SQLHelper/obj/x86/Release/SQLHelper.dll
index 7086680..aa8cffd 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.dll
+++ b/SQLHelper/obj/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.pdb b/SQLHelper/obj/x86/Release/SQLHelper.pdb
index 28f7833..de5bde2 100644
--- a/SQLHelper/obj/x86/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs
deleted file mode 100644
index e5dc9b8..0000000
--- a/SyntacticSugar/obj/Debug/.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.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 4224555..e3f4386 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -49,11 +49,11 @@
string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鑱屽憳浠ｇ爜", "h_v_IF_EmployeeList");
+ ds = oCN.RunProcReturn(sql1 + sWhere, "h_v_IF_EmployeeList");
}
else
{
- string sql = sql1 + sWhere + " order by 鑱屽憳浠ｇ爜";
+ string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 2d4fb46..ed6c532 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1248,7 +1248,7 @@
}
//鍒犻櫎鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + UserName + "'";
+ string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + UserName + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_QCCheckProject_BeforeDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
@@ -1270,7 +1270,7 @@
//==================================================================================
//鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
- if (!oBill.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBill_TKController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBill_TKController.cs"
index 60e0d12..92cbdfb 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBill_TKController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBill_TKController.cs"
@@ -396,5 +396,32 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 浜ゆ湡鍙戝竷
+ [Route("JIT_DayPlanPlatFormBill/PublishDate")]
+ [HttpGet]
+ public object PublishDate(string HDeptID)
+ {
+ try
+ {
+ //鏇存柊鐢熶骇璁㈠崟鐨勬渶鏃╁紑宸ユ棩鏈�
+ oCN.RunProc($"exec h_p_JIT_PublishDate '{HDeptID}'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "璁㈠崟瀹屽伐鏃ユ湡鍙戝竷鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
diff --git a/WebAPI/Controllers/XSGL/Xs_SellOutBillList_SecController.cs b/WebAPI/Controllers/XSGL/Xs_SellOutBillList_SecController.cs
index e6589be..7657c08 100644
--- a/WebAPI/Controllers/XSGL/Xs_SellOutBillList_SecController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SellOutBillList_SecController.cs
@@ -116,6 +116,62 @@
}
#endregion
+ #region 閫氱敤鏌ヨ鏂规硶(涓�娆℃煡璇㈠琛�)
+ [Route("CommonModel/searchMethodList")]
+ [HttpGet]
+ public object searchMethodList(string sql, string user, string ModRightNameCheck)
+ {
+ try
+ {
+
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (ModRightNameCheck != null && ModRightNameCheck != "")
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ds = oCN.RunProcReturn(sql, sql);
+ //鑾峰彇澶氫釜琛ㄥ垪鍚�
+ List<object> columnNameLists = new List<object>();
+ for (int i = 0; i < ds.Tables.Count; i++)
+ {
+ //鑾峰彇鍒椾俊鎭�
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ foreach (DataColumn col in ds.Tables[i].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ columnNameLists.Add(columnNameList);
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameLists;//灏哻olumnNameList璧嬪�肩粰objJsonResult鐨刲ist灞炴��
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鍔犲叆鍗曟嵁鍒板緟鏍搁攢闃熷垪
[Route("Xs_SellOutBillList_Sec/addBillToWaitSecList")]
[HttpGet]
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 6e67119..1fa2450 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"
@@ -14,6 +14,43 @@
namespace WebAPI.Controllers
{
#region 鍗庤繙璇锋眰鍩虹璧勬枡
+
+ #region 鐐．VRS鍐呭眰鎻愬彇涓婁紶浜岀淮鐮佷綅缃帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSInner_savePNLBarCodePosition_RequestParams
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜缂栧彿
+ public string HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public string HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ public class VRSInner_savePNLBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSInner_getPNLBarCodePosition_RequestParams
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜缂栧彿
+ }
+
+ public class VRSInner_getPNLBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<VRSInner_getPNLBarCodePosition_RequestResult_data> data;
+ }
+ public class VRSInner_getPNLBarCodePosition_RequestResult_data
+ {
+ public string HBarCode_PNL; //PNL鏉＄爜鍙�
+ public double HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public double HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ #endregion
+
#region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙� 鐩稿叧妯″瀷绫�
public class VRSInner_saveCheckNote_RequestParams
{
@@ -36,6 +73,42 @@
public string code;
public string msg;
}
+ #endregion
+
+ #region 鐐．VRS澶栧眰鎻愬彇涓婁紶浜岀淮鐮佷綅缃帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSOuter_saveSetBarCodePosition_RequestParams
+ {
+ public string HBarCode_Set; //Set鏉＄爜缂栧彿
+ public string HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public string HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
+ public class VRSOuter_saveSetBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇set浜岀淮鐮佷綅缃俊鎭帴鍙� 鐩稿叧妯″瀷绫�
+ public class VRSOuter_getSetBarCodePosition_RequestParams
+ {
+ public string HBarCode_Set; //set鏉＄爜缂栧彿
+ }
+
+ public class VRSOuter_getSetBarCodePosition_RequestResult
+ {
+ public string code;
+ public string msg;
+ public List<VRSOuter_getSetBarCodePosition_RequestResult_data> data;
+ }
+ public class VRSOuter_getSetBarCodePosition_RequestResult_data
+ {
+ public string HBarCode_Set; //Set鏉＄爜鍙�
+ public double HPosition_x; //浜岀淮鐮亁鍧愭爣
+ public double HPosition_y; //浜岀淮鐮亂鍧愭爣
+ }
+
#endregion
#region 鐐．VRS澶栧眰鑾峰彇datamapping鎺ュ彛 鐩稿叧妯″瀷绫�
@@ -208,6 +281,97 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region 鐐．VRS鍐呭眰鎻愬彇涓婁紶PNL浜岀淮鐮佷綅缃� 鎺ュ彛
+ [Route("VRSInner/VRSInner_savePNLBarCodePosition")]
+ [HttpGet]
+ public VRSInner_savePNLBarCodePosition_RequestResult VRSInner_savePNLBarCodePosition(string HBarCode_PNL,double HPNLPosition_x,double HPNLPosition_y)
+ {
+ VRSInner_savePNLBarCodePosition_RequestResult result = new VRSInner_savePNLBarCodePosition_RequestResult();
+ try
+ {
+ string HLayOutName = ""; //PNL鏉＄爜缂栧彿瀵瑰簲鐨凱NL甯冨眬鍚嶇О
+
+ string sql = @"
+ select b.HLayOutName
+ from Gy_BarCodeBill_PNL_Temp as a
+ inner join Gy_PNLInfo as b on a.HLayOutName = b.HLayOutName
+ where a.HBarCode = '" + HBarCode_PNL + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ return result;
+ }
+ else
+ {
+ HLayOutName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HLayOutName"]);
+ }
+
+ string sql_save = "" +
+ "update Gy_PNLInfo set HPNLPosition_x = " + HPNLPosition_x + ",HPNLPosition_y = " + HPNLPosition_y + " where HLayOutName = '" + HLayOutName + "'";
+ oCN.RunProc(sql_save);
+
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛";
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭� 鎺ュ彛
+ [Route("VRSInner/VRSInner_getPNLBarCodePosition")]
+ [HttpGet]
+ public VRSInner_getPNLBarCodePosition_RequestResult VRSInner_getPNLBarCodePosition(string HBarCode_PNL)
+ {
+ VRSInner_getPNLBarCodePosition_RequestResult result = new VRSInner_getPNLBarCodePosition_RequestResult();
+ List<VRSInner_getPNLBarCodePosition_RequestResult_data> dataList = new List<VRSInner_getPNLBarCodePosition_RequestResult_data>();
+ try
+ {
+ string sql = @"
+ select top(1) b.*
+ from Gy_BarCodeBill_PNL_Temp as a
+ inner join Gy_PNLInfo as b on a.HLayOutName = b.HLayOutName
+ where a.HBarCode = '" + HBarCode_PNL + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "PNL浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠PNL浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
+ result.data = null;
+ return result;
+ }
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ VRSInner_getPNLBarCodePosition_RequestResult_data data = new VRSInner_getPNLBarCodePosition_RequestResult_data();
+ data.HBarCode_PNL = HBarCode_PNL;
+ data.HPosition_x = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HPNLPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HPNLPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
#region 鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犳帴鍙�
[Route("VRSInner/VRSInner_saveCheckNote")]
@@ -292,6 +456,167 @@
}
#endregion
+ #region 鐐．VRS澶栧眰鎻愬彇涓婁紶set浜岀淮鐮佷綅缃� 鎺ュ彛
+ [Route("VRSOuter/VRSOuter_saveSetBarCodePosition")]
+ [HttpGet]
+ public VRSOuter_saveSetBarCodePosition_RequestResult VRSOuter_saveSetBarCodePosition(string HBarCode_Set, double HSetPosition_x, double HSetPosition_y)
+ {
+ VRSOuter_saveSetBarCodePosition_RequestResult result = new VRSOuter_saveSetBarCodePosition_RequestResult();
+ try
+ {
+ string HLayOutName = ""; //Set鏉＄爜缂栧彿瀵瑰簲鐨凱NL甯冨眬鍚嶇О
+ string HSetNo = ""; //set鍙�
+
+ string sql = @"
+ select distinct
+ c.HLayOutName
+ ,d.HSetNo
+ from Gy_BarCodeBill_Set_Temp as a
+ inner join Gy_BarCodeBill_PNL_Temp as b on a.HBarCode_PNL = b.HBarCode
+ inner join Gy_PNLInfo as c on b.HLayOutName = c.HLayOutName
+ inner join Gy_PNLInfoSub as d on c.HInterID = d.HInterID
+ where b.HBarCode + d.HSetNo = a.HBarCode
+ and a.HBarCode = '" + HBarCode_Set + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_Set_Temp");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ return result;
+ }
+ else
+ {
+ HLayOutName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HLayOutName"]);
+ HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ }
+
+ string sql_save = "" +
+ "update b set " +
+ "b.HSetPosition_x = " + HSetPosition_x + " " +
+ ",b.HSetPosition_y = " + HSetPosition_y +" " +
+ "from Gy_PNLInfo as a " +
+ "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
+ "where a.HLayOutName = '" + HLayOutName + "' " +
+ "and b.HSetNo = '" + HSetNo + "'";
+ oCN.RunProc(sql_save);
+
+ result.code = "1";
+ result.msg = "涓婁紶鎴愬姛";
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS澶栧眰鑾峰彇Set浜岀淮鐮佷綅缃俊鎭� 鎺ュ彛
+ [Route("VRSOuter/VRSOuter_getSetBarCodePosition")]
+ [HttpGet]
+ public VRSOuter_getSetBarCodePosition_RequestResult VRSOuter_getSetBarCodePosition(string HBarCode_Set)
+ {
+ VRSOuter_getSetBarCodePosition_RequestResult result = new VRSOuter_getSetBarCodePosition_RequestResult();
+ List<VRSOuter_getSetBarCodePosition_RequestResult_data> dataList = new List<VRSOuter_getSetBarCodePosition_RequestResult_data>();
+ try
+ {
+ string sql = @"
+ select distinct
+ d.HSetNo
+ ,d.HSetPosition_x
+ ,d.HSetPosition_y
+ from Gy_BarCodeBill_Set_Temp as a
+ inner join Gy_BarCodeBill_PNL_Temp as b on a.HBarCode_PNL = b.HBarCode
+ inner join Gy_PNLInfo as c on b.HLayOutName = c.HLayOutName
+ inner join Gy_PNLInfoSub as d on c.HInterID = d.HInterID
+ where b.HBarCode + d.HSetNo = a.HBarCode
+ and a.HBarCode = '" + HBarCode_Set + "'";
+ ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill_PNL_Temp");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ result.code = "0";
+ result.msg = "Set浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠Set浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
+ result.data = null;
+ return result;
+ }
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ VRSOuter_getSetBarCodePosition_RequestResult_data data = new VRSOuter_getSetBarCodePosition_RequestResult_data();
+ data.HBarCode_Set = HBarCode_Set;
+ data.HPosition_x = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HSetPosition_x"]);
+ data.HPosition_y = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HSetPosition_y"]);
+ dataList.Add(data);
+ }
+
+ result.code = "1";
+ result.msg = "";
+ result.data = dataList;
+ return result;
+ }
+ catch (Exception e)
+ {
+ result.code = "0";
+ result.msg = "" + e.Message;
+ result.data = null;
+ return result;
+ }
+ }
+ #endregion
+
+ #region 鐐．VRS鍐呭眰鐢宠PNL鏉＄爜鎺ュ彛
+
+ /// <summary>
+ /// 鐢宠PNL鏉＄爜鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
+ [HttpGet]
+ public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "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;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢宠PNL鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 鐐．VRS澶栧眰鑾峰彇datamapping鏁版嵁 鎺ュ彛
[Route("VRSOuter/VRSOuter_getDataMapping")]
[HttpGet]
@@ -302,17 +627,19 @@
try
{
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
VRSOuter_getDataMapping_RequestResult_data data = new VRSOuter_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -414,6 +741,56 @@
}
#endregion
+ #region 鐐．VRS澶栧眰鐢宠set鏉＄爜鎺ュ彛
+
+ /// <summary>
+ /// 鐢宠set鏉＄爜鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route("VRSOuter/VRSOuter_getBarCodeBill_SET")]
+ [HttpGet]
+ public object VRSOuter_getBarCodeBill_SET(string HBarCode_PNL, string HMaker)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_Set_Temp_Insert '" + HBarCode_PNL + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_Set_Temp_Insert");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍐欏叆鑾峰彇SET鏉＄爜鏃跺彂鐢熼敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢宠SET鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region AVI鑾峰彇datamapping鏁版嵁 鎺ュ彛
[Route("AVI/AVI_getDataMapping")]
[HttpGet]
@@ -423,18 +800,44 @@
List<AVI_getDataMapping_RequestResult_data> dataList = new List<AVI_getDataMapping_RequestResult_data>();
try
{
- string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode + "' " +
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string HBarCode_PNL = "";
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode + "'";
+ "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)
+ {
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
+ }
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
+
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
+ string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
+
+ //鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
+ string sql = "" +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ //"union " +
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
AVI_getDataMapping_RequestResult_data data = new AVI_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -556,23 +959,33 @@
{
HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
string HSetNo = HBarCode.Substring(HBarCode.Length-2,2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
DC_getDataMapping_RequestResult_data data = new DC_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
@@ -687,23 +1100,33 @@
{
HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
+ else
+ {
+ result.code = "0";
+ result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
+ result.data = null;
+ return result;
+ }
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鍙枫�傦紙set鏉＄爜缂栧彿瑙勫垯锛歽+ww+浜斾綅PNL娴佹按鍙�+涓や綅set鍙凤級
string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
//鏍规嵁PNL鏉＄爜缂栧彿銆乻et鍙凤紝浠嶱NL妫�楠屼俊鎭〃涓幏鍙杝et瀵瑰簲鐨勬楠屼俊鎭�
string sql = "" +
- //"select * from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ "select distinct * from (" +
+ //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
//"union " +
- "select * from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' ";
+ "select HBarCode,HPCSNo from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +
+ ") as a";
ds = oCN.RunProcReturn(sql, "QC_CheckNote_PNL_Temp");
+
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
JGG_getDataMapping_RequestResult_data data = new JGG_getDataMapping_RequestResult_data();
data.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
data.HPCSNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPCSNo"]);
- data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
- data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
+ //data.HPosition_x = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_x"]);
+ //data.HPosition_y = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[i]["HPosition_y"]);
dataList.Add(data);
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index f3a9758..d0ed4bd 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-06-09T08:45:52.0865612Z;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2025-06-19T00:14:35.0623669Z;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/09/2025 16:45:33</publishTime>
+ <publishTime>06/19/2025 08:14:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/09/2025 16:45:33</publishTime>
+ <publishTime>06/19/2025 08:14:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/09/2025 16:45:32</publishTime>
+ <publishTime>06/19/2025 08:14:15</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/09/2025 16:45:32</publishTime>
+ <publishTime>06/19/2025 08:14:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/09/2025 16:45:27</publishTime>
+ <publishTime>06/19/2025 08:14:09</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/09/2025 16:45:27</publishTime>
+ <publishTime>06/19/2025 08:14: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>06/09/2025 16:45:28</publishTime>
+ <publishTime>06/19/2025 08:14:10</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/09/2025 16:45:28</publishTime>
+ <publishTime>06/19/2025 08:14:10</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/09/2025 16:45:25</publishTime>
+ <publishTime>06/19/2025 08:14:07</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/09/2025 16:45:25</publishTime>
+ <publishTime>06/19/2025 08:14:07</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/09/2025 16:45:26</publishTime>
+ <publishTime>06/19/2025 08:14:08</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/09/2025 16:45:26</publishTime>
+ <publishTime>06/19/2025 08:14:08</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/09/2025 16:45:27</publishTime>
+ <publishTime>06/19/2025 08:14:08</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/09/2025 16:45:27</publishTime>
+ <publishTime>06/19/2025 08:14:08</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>06/09/2025 16:45:23</publishTime>
+ <publishTime>06/19/2025 08:12:18</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>06/09/2025 16:45:23</publishTime>
+ <publishTime>06/19/2025 08:12:18</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>06/09/2025 16:45:28</publishTime>
+ <publishTime>06/19/2025 08:12:22</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>06/09/2025 16:45:28</publishTime>
+ <publishTime>06/19/2025 08:12:22</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/09/2025 16:45:41</publishTime>
+ <publishTime>06/19/2025 08:14:26</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/09/2025 16:45:41</publishTime>
+ <publishTime>06/19/2025 08:14:26</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>06/09/2025 16:45:45</publishTime>
+ <publishTime>06/19/2025 08:14:31</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
<publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/09/2025 16:45:51</publishTime>
+ <publishTime>06/16/2025 11:00:02</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 4538278..89f0a22 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-06-12T07:16:16.9926905Z;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-06-18T06:13:15.0141966Z;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>06/12/2025 15:15:22</publishTime>
+ <publishTime>06/18/2025 14:12:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/12/2025 15:15:22</publishTime>
+ <publishTime>06/18/2025 14:12:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/12/2025 15:15:19</publishTime>
+ <publishTime>06/18/2025 14:12:38</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/12/2025 15:15:19</publishTime>
+ <publishTime>06/18/2025 14:12:38</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/12/2025 15:15:10</publishTime>
+ <publishTime>06/18/2025 14:12:31</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/12/2025 15:15:10</publishTime>
+ <publishTime>06/18/2025 14:12:31</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>06/12/2025 15:15:12</publishTime>
+ <publishTime>06/18/2025 14:12:32</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/12/2025 15:15:12</publishTime>
+ <publishTime>06/18/2025 14:12:32</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>06/12/2025 15:15:06</publishTime>
+ <publishTime>06/18/2025 14:12:28</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/12/2025 15:15:06</publishTime>
+ <publishTime>06/18/2025 14:12:28</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/12/2025 15:15:09</publishTime>
+ <publishTime>06/18/2025 14:12:29</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/12/2025 15:15:09</publishTime>
+ <publishTime>06/18/2025 14:12:29</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/12/2025 15:15:09</publishTime>
+ <publishTime>06/18/2025 14:12:30</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/12/2025 15:15:09</publishTime>
+ <publishTime>06/18/2025 14:12:30</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>05/29/2025 20:03:24</publishTime>
+ <publishTime>06/18/2025 14:12:25</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>05/29/2025 20:03:24</publishTime>
+ <publishTime>06/18/2025 14:12:25</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>06/12/2025 15:15:12</publishTime>
+ <publishTime>06/18/2025 14:12:32</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>06/12/2025 15:15:12</publishTime>
+ <publishTime>06/18/2025 14:12:32</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/12/2025 15:15:34</publishTime>
+ <publishTime>06/18/2025 14:12:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/12/2025 15:15:34</publishTime>
+ <publishTime>06/18/2025 14:12:51</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>06/12/2025 15:16:15</publishTime>
+ <publishTime>06/18/2025 14:13:13</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 008a66e..59e7811 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index a98e556..7b47608 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
similarity index 70%
rename from sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
rename to sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 655b91e..b3a6f35 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index dd9e641..f67032a 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,6 @@
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
index 008a66e..59e7811 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index a98e556..7b47608 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1