From 2731daa8707f14c8ade1370790c8884179984232 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 八月 2024 16:08:45 +0800
Subject: [PATCH] 1

---
 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user                   |  295 +++++++++++++++----
 BLL/bin/Release/SQLHelper.pdb                                         |    0 
 DAL/bin/Release/DBUtility.dll                                         |    0 
 DAL/bin/Release/Pub_Control.dll                                       |    0 
 DBUtility/bin/Release/Pub_Control.pdb                                 |    0 
 WebAPI/Controllers/BLL/Xt_BillTypeController.cs                       |   50 ++-
 WebAPI/WebAPI.csproj.user                                             |    7 
 BLL/bin/Release/SQLHelper.dll                                         |    0 
 DAL/bin/Release/DBUtility.pdb                                         |    0 
 DAL/bin/Release/Model.dll                                             |    0 
 DBUtility/bin/Release/Pub_Class.dll                                   |    0 
 DBUtility/bin/Release/Pub_Control.dll                                 |    0 
 Model/bin/Release/SQLHelper.pdb                                       |    0 
 DAL/bin/Release/Pub_Control.pdb                                       |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache   |    0 
 WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs          |    8 
 SQLHelper/obj/Release/SQLHelper.dll                                   |    0 
 Model/bin/Release/Pub_Control.pdb                                     |    0 
 BLL/bin/Release/Model.dll                                             |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb                            |    0 
 Model/bin/Release/Pub_Class.pdb                                       |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache    |    0 
 BLL/bin/Release/Model.pdb                                             |    0 
 DAL/bin/Release/Model.pdb                                             |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll                              |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.dll                            |    0 
 SQLHelper/obj/Release/SQLHelper.pdb                                   |    0 
 sdk_dingding/TopSdk/bin/Release/TopSdk.dll                            |    0 
 Model/obj/Release/Model.pdb                                           |    0 
 DBUtility/bin/Release/DBUtility.pdb                                   |    0 
 DBUtility/bin/Release/DBUtility.dll                                   |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                              |    0 
 Model/bin/Release/Pub_Control.dll                                     |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache |    0 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache        |    0 
 Pub_Control/bin/Release/Pub_Class.pdb                                 |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user         |  258 ++++++++--------
 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb                            |    0 
 WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs           |   82 +++++
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt      |   45 --
 Pub_Control/bin/Release/Pub_Class.dll                                 |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                              |    0 
 WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs        |    2 
 WebAPI/Controllers/GG_NoticeController.cs                             |   46 +++
 BLL/bin/Release/Pub_Control.pdb                                       |    0 
 Pub_Class/bin/Release/Pub_Class.pdb                                   |    0 
 Pub_Control/bin/Release/Pub_Control.dll                               |    0 
 BLL/bin/Release/DBUtility.pdb                                         |    0 
 DAL/bin/Release/SQLHelper.dll                                         |    0 
 Model/bin/Release/DBUtility.pdb                                       |    0 
 SQLHelper/bin/Release/SQLHelper.dll                                   |    0 
 SQLHelper/bin/Release/Pub_Class.pdb                                   |    0 
 BLL/bin/Release/Pub_Control.dll                                       |    0 
 Pub_Class/bin/Release/Pub_Class.dll                                   |    0 
 DAL/bin/Release/SQLHelper.pdb                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache         |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache        |    0 
 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs           |   43 ++
 SQLHelper/bin/Release/Pub_Class.dll                                   |    0 
 SQLHelper/bin/Release/SQLHelper.pdb                                   |    0 
 DBUtility/obj/Release/DBUtility.pdb                                   |    0 
 Model/bin/Release/DBUtility.dll                                       |    0 
 DAL/bin/Release/Pub_Class.pdb                                         |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml              |    8 
 BLL/bin/Release/DBUtility.dll                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache      |    0 
 WebAPI/Web.config                                                     |    4 
 Pub_Control/bin/Release/Pub_Control.pdb                               |    0 
 DBUtility/obj/Release/DBUtility.dll                                   |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb                              |    0 
 Model/obj/Release/Model.dll                                           |    0 
 BLL/bin/Release/Pub_Class.dll                                         |    0 
 DAL/质检管理/ClsQC_PatrolProcCheckOtherBill.cs                            |    2 
 DBUtility/bin/Release/SQLHelper.dll                                   |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt    |   12 
 Model/obj/Release/Model.csproj.AssemblyReference.cache                |    0 
 Model/bin/Release/Model.pdb                                           |    0 
 DBUtility/bin/Release/SQLHelper.pdb                                   |    0 
 DAL/bin/Release/Pub_Class.dll                                         |    0 
 Model/bin/Release/Pub_Class.dll                                       |    0 
 Model/bin/Release/Model.dll                                           |    0 
 /dev/null                                                             |    1 
 DBUtility/bin/Release/Pub_Class.pdb                                   |    0 
 BLL/bin/Release/Pub_Class.pdb                                         |    0 
 Model/bin/Release/SQLHelper.dll                                       |    0 
 85 files changed, 585 insertions(+), 278 deletions(-)

diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index 15c73e2..0f4e7d0 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 162529f..db37aae 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index b355155..b0ba70e 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index e9dbdff..e4a0126 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index ea2daf3..ad445eb 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 008112a..1d6d950 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index 15c73e2..0f4e7d0 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 162529f..db37aae 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index b355155..b0ba70e 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index e9dbdff..e4a0126 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index ea2daf3..ad445eb 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index 008112a..1d6d950 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
index 4dae845..00882d0 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
@@ -151,7 +151,7 @@
                       ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty + 
                       "," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
                       "'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
-                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
+                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + Convert.ToString(oSub.HKeyInspect ? 1 : 0)+ ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                 }
               
                 sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 15c73e2..0f4e7d0 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 162529f..db37aae 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index ea2daf3..ad445eb 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index 008112a..1d6d950 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index ca9c598..b507675 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 02d48ba..309a183 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index d2cdf67..fe72aa5 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 15c73e2..0f4e7d0 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 162529f..db37aae 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 15c73e2..0f4e7d0 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 162529f..db37aae 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index b355155..b0ba70e 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index e9dbdff..e4a0126 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index ea2daf3..ad445eb 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index 008112a..1d6d950 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 14c2b27..75f031e 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index b355155..b0ba70e 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index e9dbdff..e4a0126 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index ea2daf3..ad445eb 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index 008112a..1d6d950 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 1f090a7..1b5fc29 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 0fd9cc0..8b22c96 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/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 2f2af22..b554d8f 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 67b496f..81b31e4 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 31b5edf..c8fb919 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
index 7ebf34f..b9eeacb 100644
--- a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
+++ b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
@@ -13,11 +13,9 @@
     public class Xt_BillTypeController : ApiController
     {
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
-
 
         /// <summary>
         /// 杩斿洖鍗曟嵁绫诲瀷鍒楄〃
@@ -77,7 +75,6 @@
                 return objJsonResult;
             }
         }
-
 
         /// <summary>
         /// 鍗曟嵁绫诲瀷鍒楄〃淇敼鏂规硶
@@ -146,7 +143,6 @@
         [HttpPost]
         public object AddBill1([FromBody] JObject oMain)
         {
-
             try
             {
                 var _value = oMain["oMain"].ToString();
@@ -169,8 +165,6 @@
                 string HViewName = list[0].HViewName;
                 string HRightName = list[0].HRightName;
 
-
-               
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
                 //涓昏〃
@@ -204,7 +198,6 @@
             }
         }
 
-
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -220,11 +213,7 @@
                 string msg1 = _value.ToString();
                 //鍙嶅簭鍒楀寲
                 msg1 = "[" + msg1.ToString() + "]";
-
-
-
                 List<BillType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BillType>>(msg1);
-
                 long HItemID = list[0].HItemID;
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
@@ -234,13 +223,9 @@
                 string HViewName = list[0].HViewName;
                 string HRightName = list[0].HRightName;
 
-
-
-
-
-
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
+
                 //涓昏〃
                 oCN.RunProc("Insert Into Xt_BillType " +
                 "(HNumber,HName,HTemplate,HHeadTable" +
@@ -268,6 +253,39 @@
             }
         }
 
+        
+        /// <summary>
+        /// 鍗曟嵁鍒犻櫎
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("YS_ReceiveBill/delete_Test1")]
+        [HttpGet]
+        public object deleteYS_ReceiveBill(long HItemID)
+        {
+            try
+            {
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCN.BeginTran();
+                //涓昏〃
+                oCN.RunProc("delete from Xt_BillType Where HItemID =" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                oCN.Commit();
+                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;
+            }
+        }
+
         #region 鍗曟嵁绫诲瀷 閲戣澏鍚屾
         [Route("Xt_BillType/SaveXt_BillTypeListApi")]
         [HttpPost]
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index 6d253d8..0753af0 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -306,5 +306,51 @@
         }
         #endregion
 
+        /// <summary>
+        /// 鏍规嵁鐢ㄦ埛鍚嶈幏鍙栧叕鍛婂垪琛�
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [Route("GG_Notice/notices")]
+        [HttpGet]
+        public object getNotices(string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 绱ф�ョ▼搴�, m.HContext as 涓婚 " +
+                           " , m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
+                           " from OA_InformBillMain as m" +
+                           " inner join OA_InformBillSub as s on m.HInterID = s.HInterID" +
+                           " left join Gy_Department d on m.HDeptID = d.HItemID" +
+                           " where 1 = 1 and" + " s.HReceiveMan =" + "'" + user + "'" +
+                           " order by m.HMakeDate desc";
+
+                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "OA_InformBillMain");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch(Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
     }
 }
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index f525028..0ae4bd1 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -746,7 +746,7 @@
                 {
                     if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl == "Y")
                     {
-                        ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HICMOBillNo = '" + oBill.omodel.HICMOBillNo + "' and HInterID = '" + oBill.omodel.HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
+                        ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HSourceBillNo = '" + oBill.omodel.HProcExchBillNo + "' and HSourceInterID = '" + oBill.omodel.HProcExchInterID + "'and HSourceEntryID = '" + oBill.omodel.HProcExchEntryID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
                         if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
                         {
                             objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 08ca53e..cf91001 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -2925,7 +2925,7 @@
                 {
 
                     bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 1, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
+                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 2, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
                 }
                 else if (refSav == "Update")
                 {
@@ -6653,7 +6653,7 @@
 
             }
 
-            if (HHandleEmpID==0) //寮傚父鍙嶉楠屾敹鍗曚繚瀛�  灏嗘秷鎭� 鍙戦�佺粰 鎺ユ敹浜猴紝鎸囨淳澶勭悊浜猴紝鍏ㄩ儴鎶勯�佷汉 
+            if (HHandleEmpID==0) // 
             {
                 string HReceiveMan = HSendMan;
                 string[] names = HCopyMan.Split(',');
@@ -6674,13 +6674,14 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸查獙鏀�";
             }
-            else if (HHandleEmpID==1)//寮傚父鍙嶉绛惧埌鍗�,寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
+            else if (HHandleEmpID==1)//寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
             {
                 //鑾峰彇鍙戦�佷汉  鎺ユ敹浜�
                 string HReceiveMan = HCopyMan;
                 string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
-                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");               
+                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");                   
                 List<string> HNames = new List<string>();
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
@@ -6689,16 +6690,13 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸茬鍒�";
             }
-            else
+            else if (HHandleEmpID == 2)//寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
             {
-                //鏌ヨ鎸囨淳澶勭悊浜�
-                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
-                ds = oCN.RunProcReturn(sql, "Gy_Employee");
-                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
-                //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
-                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
-                LogService.CustomWriteLog("10鍙傛暟" + sql1, "寮傚父缃氭");
+                //鑾峰彇鍙戦�佷汉  鎺ユ敹浜�
+                string HReceiveMan = HCopyMan;
+                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
                 ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                 List<string> HNames = new List<string>();
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -6708,7 +6706,26 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
-                LogService.CustomWriteLog("9鍙傛暟" + concatenatedNames, "寮傚父缃氭");
+                HDescription = HDescription + "--宸插鐞�";
+            }
+            else
+            {
+                //鏌ヨ鎸囨淳澶勭悊浜�
+                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
+                ds = oCN.RunProcReturn(sql, "Gy_Employee");
+                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
+                //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
+                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
+                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+                List<string> HNames = new List<string>();
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                {
+                    string HName = ds.Tables[0].Rows[i]["閽夐拤id"].ToString();
+                    HNames.Add(HName);
+
+                }
+                concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸叉帴鏀�";
             }
           
             //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index bf33427..a20b31e 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -1427,5 +1427,87 @@
         }
         #endregion
 
+        #region 璐ㄩ噺妯″潡 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+
+        /// <summary>
+        /// 鍒剁▼闄烽槺娴嬭瘯瓒嬪娍鍥炬姤琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
+        [HttpGet]
+        public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
+                List<object> columnNameList = new List<object>();
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+                //}
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
+        #region 璐ㄩ噺妯″潡 PPM缁╂晥瓒嬪娍鍥炬姤琛�
+
+        /// <summary>
+        /// PPM缁╂晥瓒嬪娍鍥炬姤琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
+        [HttpGet]
+        public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
+                List<object> columnNameList = new List<object>();
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+                //}
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
     }
 }
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
index 3453dcc..222eabd 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -181,7 +181,8 @@
                             FormId = "BD_UNITCONVERTRATE",
                             FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
                             ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
-                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE" +
+                            ",FMATERIALID.FNUMBER",
                             FilterString = "",
                             OrderString = "",
                             TopRowCount = 0,
@@ -245,6 +246,7 @@
                                 HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
                                 HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
                                 HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+                                HMaterNumber = DBUtility.ClsPub.isStrNull(arr[i, 19]),
                             };
 
                             //鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
@@ -253,7 +255,7 @@
                                     (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                                     ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
                                     ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
-                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber
                                     ,HMakeEmp,HMakeTime
                                     ,HCheckEmp,HCheckTime
                                     ,HModifyEmp,HModifyTime
@@ -261,7 +263,7 @@
                                     Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
                                     ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
                                     ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
-                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID},'{subData.HMaterNumber}'
                                     ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
                                     ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
                                     ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 0186fdd..0401602 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,12 +4,12 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2024-08-22T01:48:50.0760398Z;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+    <History>True|2024-08-23T01:28:59.6852470Z;False|2024-08-23T09:28:05.1857669+08:00;True|2024-08-22T09:38:03.7896560+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="bin/AlibabaCloud.EndpointUtil.dll">
       <publishTime>04/07/2020 16:33:48</publishTime>
@@ -39,139 +39,139 @@
       <publishTime>07/24/2024 10:36:58</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/22/2024 09:36:27</publishTime>
+      <publishTime>08/22/2024 09:37:54</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/22/2024 09:36:27</publishTime>
+      <publishTime>08/22/2024 09:37:54</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/18/2020 05:32:28</publishTime>
+      <publishTime>12/17/2020 21:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>08/22/2024 09:36:26</publishTime>
+      <publishTime>08/22/2024 09:37:52</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>08/22/2024 09:36:26</publishTime>
+      <publishTime>08/22/2024 09:37:52</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>07/22/2016 22:52:40</publishTime>
+      <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/19/2024 08:52:30</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/19/2024 08:52:30</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
-      <publishTime>03/22/2022 13:17:26</publishTime>
+      <publishTime>03/22/2022 05:17:26</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.pdb">
-      <publishTime>03/19/2022 07:39:42</publishTime>
+      <publishTime>03/18/2022 23:39:42</publishTime>
     </File>
     <File Include="bin/Grpc.Core.dll">
-      <publishTime>03/22/2022 13:17:20</publishTime>
+      <publishTime>03/22/2022 05:17:20</publishTime>
     </File>
     <File Include="bin/Grpc.Core.pdb">
-      <publishTime>03/19/2022 07:39:48</publishTime>
+      <publishTime>03/18/2022 23:39:48</publishTime>
     </File>
     <File Include="bin/grpc_csharp_ext.x64.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="bin/grpc_csharp_ext.x86.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>02/08/2023 09:47:46</publishTime>
+      <publishTime>02/09/2023 20:21:24</publishTime>
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.dylib">
-      <publishTime>03/19/2022 07:38:44</publishTime>
+      <publishTime>03/18/2022 23:38:44</publishTime>
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.so">
-      <publishTime>03/19/2022 07:38:42</publishTime>
+      <publishTime>03/18/2022 23:38:42</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
-      <publishTime>03/19/2015 01:02:50</publishTime>
+      <publishTime>03/18/2015 17:02:50</publishTime>
     </File>
     <File Include="bin/Microsoft.CSharp.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 19:48:56</publishTime>
+      <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/22/2024 09:37:49</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/22/2024 09:37:49</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/08/2023 15:09:56</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 09:07:56</publishTime>
+      <publishTime>10/23/2021 01:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.pdb">
-      <publishTime>10/23/2021 17:07:56</publishTime>
+      <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
-    </File>
-    <File Include="bin/NPOI.OpenXmlFormats.dll">
       <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
-      <publishTime>08/31/2012 06:22:50</publishTime>
+      <publishTime>08/30/2012 22:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/19/2024 08:52:29</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
-      <publishTime>02/16/2015 01:57:08</publishTime>
+      <publishTime>02/15/2015 17:57:08</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
-      <publishTime>07/19/2017 18:01:28</publishTime>
+      <publishTime>07/19/2017 10:01:28</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -195,10 +195,10 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
-      <publishTime>08/19/2014 18:03:34</publishTime>
+      <publishTime>08/19/2014 10:03:34</publishTime>
     </File>
     <File Include="bin/System.Memory.dll">
-      <publishTime>04/18/2019 00:24:34</publishTime>
+      <publishTime>04/17/2019 16:24:34</publishTime>
     </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -207,13 +207,13 @@
       <publishTime>02/20/2015 04:10:46</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 21:00:36</publishTime>
+      <publishTime>11/28/2018 13:00:36</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Primitives.dll">
       <publishTime>02/20/2015 04:10:46</publishTime>
     </File>
     <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
-      <publishTime>09/19/2018 03:38:10</publishTime>
+      <publishTime>09/18/2018 19:38:10</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -222,7 +222,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 20:58:44</publishTime>
+      <publishTime>11/28/2018 12:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -237,37 +237,37 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 21:01:26</publishTime>
+      <publishTime>11/28/2018 13:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 21:01:00</publishTime>
+      <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>01/28/2015 12:02:18</publishTime>
+      <publishTime>01/28/2015 04:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 23:26:04</publishTime>
+      <publishTime>02/11/2014 15:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>01/28/2015 12:02:32</publishTime>
+      <publishTime>01/28/2015 04:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Xml.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -279,22 +279,22 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/23/2024 09:26:48</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/23/2024 09:26:48</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
-      <publishTime>11/24/2014 19:18:48</publishTime>
+      <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/22/2024 09:36:30</publishTime>
+      <publishTime>08/23/2024 09:28:53</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/22/2024 09:36:30</publishTime>
+      <publishTime>08/23/2024 09:28:53</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>07/18/2013 01:03:52</publishTime>
+      <publishTime>07/17/2013 17:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
       <publishTime>11/29/2018 21:26:02</publishTime>
@@ -303,190 +303,190 @@
       <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="Config/kdapi.config">
-      <publishTime>08/15/2022 15:46:13</publishTime>
+      <publishTime>07/12/2024 16:38:23</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>11/01/2021 09:26:33</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>02/08/2023 09:47:46</publishTime>
+      <publishTime>02/09/2023 20:21:24</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="grpc_csharp_ext.x64.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="grpc_csharp_ext.x86.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="libgrpc_csharp_ext.x64.dylib">
-      <publishTime>03/19/2022 07:38:44</publishTime>
+      <publishTime>03/18/2022 23:38:44</publishTime>
     </File>
     <File Include="libgrpc_csharp_ext.x64.so">
-      <publishTime>03/19/2022 07:38:42</publishTime>
+      <publishTime>03/18/2022 23:38:42</publishTime>
     </File>
     <File Include="libman.json">
-      <publishTime>07/18/2023 17:26:29</publishTime>
+      <publishTime>07/17/2023 13:22:30</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/15/2024 22:14:00</publishTime>
+      <publishTime>08/21/2024 16:12:07</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>08/19/2021 09:44:01</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:22</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:23</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:22</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:22</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:22</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:23</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>03/31/2023 09:57:09</publishTime>
+      <publishTime>04/28/2024 15:55:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:24</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:24</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:23</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:24</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:24</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>04/28/2024 15:55:27</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
-      <publishTime>05/13/2024 10:26:00</publishTime>
+      <publishTime>04/28/2024 15:55:16</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/22/2024 09:48:49</publishTime>
+      <publishTime>08/22/2024 09:38:00</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index 8d164d4..f063768 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+=======
     <DeleteExistingFiles>True</DeleteExistingFiles>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
+<<<<<<< HEAD
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+=======
     <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 2c90d52..5a7ed3f 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,10 +5,38 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+    <History>True|2024-08-22T03:12:48.4249984Z;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+      <publishTime>04/07/2020 08:33:48</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+      <publishTime>04/25/2023 09:49:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+      <publishTime>07/31/2024 12:50:30</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+      <publishTime>08/06/2024 10:07:52</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+      <publishTime>11/22/2022 03:24:18</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+      <publishTime>08/08/2024 11:43:22</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaUtil.dll">
+      <publishTime>07/15/2024 12:25:56</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaXML.dll">
+      <publishTime>08/03/2022 13:46:08</publishTime>
+    </File>
+    <File Include="bin/Aliyun.Credentials.dll">
+      <publishTime>07/24/2024 02:36:58</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -17,19 +45,61 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>08/22/2024 11:06:06</publishTime>
+    </File>
+    <File Include="bin/BLL.pdb">
+      <publishTime>08/22/2024 11:06:06</publishTime>
+    </File>
+    <File Include="bin/BouncyCastle.Crypto.dll">
+      <publishTime>12/17/2020 21:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>06/25/2021 16:26:52</publishTime>
+      <publishTime>08/22/2024 11:06:03</publishTime>
+    </File>
+    <File Include="bin/DAL.pdb">
+      <publishTime>08/22/2024 11:06:03</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>08/22/2024 11:05:59</publishTime>
+    </File>
+    <File Include="bin/DBUtility.pdb">
+      <publishTime>08/22/2024 11:05:59</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.dll">
+      <publishTime>03/22/2022 05:17:26</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.pdb">
+      <publishTime>03/18/2022 23:39:42</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.dll">
+      <publishTime>03/22/2022 05:17:20</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.pdb">
+      <publishTime>03/18/2022 23:39:48</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 05:17:22</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 05:17:22</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.dll">
+      <publishTime>05/08/2021 17:08:30</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>02/08/2023 09:18:13</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/18/2022 23:38:44</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.so">
+      <publishTime>03/18/2022 23:38:42</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
       <publishTime>03/18/2015 17:02:50</publishTime>
@@ -41,22 +111,67 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>06/17/2021 23:18:55</publishTime>
+      <publishTime>08/22/2024 11:06:00</publishTime>
+    </File>
+    <File Include="bin/Model.pdb">
+      <publishTime>08/22/2024 11:06:00</publishTime>
+    </File>
+    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+      <publishTime>09/05/2022 17:03:10</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>08/03/2014 20:33:56</publishTime>
+      <publishTime>03/08/2023 07:09:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.dll">
+      <publishTime>10/23/2021 01:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 09:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.pdb">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.pdb">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.pdb">
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>05/21/2020 10:51:50</publishTime>
+      <publishTime>08/22/2024 11:05:56</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.pdb">
+      <publishTime>08/22/2024 11:05:56</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>08/22/2024 11:05:57</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.pdb">
+      <publishTime>08/22/2024 11:05:57</publishTime>
+    </File>
+    <File Include="bin/RestSharp.dll">
+      <publishTime>08/30/2012 22:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>08/22/2024 11:05:58</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.pdb">
+      <publishTime>08/22/2024 11:05:58</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/15/2015 17:57:08</publishTime>
+    </File>
+    <File Include="bin/System.Buffers.dll">
+      <publishTime>07/19/2017 10:01:28</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -82,11 +197,23 @@
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
       <publishTime>08/19/2014 10:03:34</publishTime>
     </File>
+    <File Include="bin/System.Memory.dll">
+      <publishTime>04/17/2019 16:24:34</publishTime>
+    </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
+    <File Include="bin/System.Net.Http.Extensions.dll">
+      <publishTime>02/19/2015 20:10:46</publishTime>
+    </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
       <publishTime>11/28/2018 13:00:36</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Primitives.dll">
+      <publishTime>02/19/2015 20:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+      <publishTime>09/18/2018 19:38:10</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -119,7 +246,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:08</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -148,14 +275,23 @@
     <File Include="bin/System.Xml.Linq.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
+    <File Include="bin/Tea.dll">
+      <publishTime>05/09/2023 02:43:40</publishTime>
+    </File>
+    <File Include="bin/TopSdk.dll">
+      <publishTime>08/22/2024 11:05:59</publishTime>
+    </File>
+    <File Include="bin/TopSdk.pdb">
+      <publishTime>08/22/2024 11:05:59</publishTime>
+    </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>06/28/2021 10:34:31</publishTime>
+      <publishTime>08/22/2024 11:06:14</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>06/28/2021 10:34:31</publishTime>
+      <publishTime>08/22/2024 11:06:14</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/17/2013 17:03:52</publishTime>
@@ -166,164 +302,191 @@
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
       <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
+    <File Include="Config/kdapi.config">
+      <publishTime>11/27/2023 09:14:13</publishTime>
+    </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:02:53</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:02:53</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:02:53</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:02</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>06/25/2021 16:26:52</publishTime>
+      <publishTime>09/05/2022 17:03:06</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:07</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>02/08/2023 09:18:13</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>06/17/2021 23:18:55</publishTime>
+      <publishTime>09/05/2022 17:03:07</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:07</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>05/21/2020 10:51:50</publishTime>
+      <publishTime>09/05/2022 17:03:07</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:08</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>01/10/2023 17:20:14</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 05:17:22</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:09</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/18/2022 23:38:44</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.so">
+      <publishTime>03/18/2022 23:38:42</publishTime>
+    </File>
+    <File Include="libman.json">
+      <publishTime>07/24/2023 08:56:46</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:09</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>01/21/2021 13:19:40</publishTime>
+      <publishTime>08/15/2024 22:03:48</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:10</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:10</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>01/13/2021 21:47:30</publishTime>
+      <publishTime>09/05/2022 17:03:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>02/22/2021 09:25:21</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>02/22/2021 09:25:21</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>02/22/2021 09:25:21</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>02/22/2021 09:25:21</publishTime>
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+      <publishTime>01/24/2024 11:35:26</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>02/22/2021 09:25:20</publishTime>
+      <publishTime>01/24/2024 11:35:25</publishTime>
+    </File>
+    <File Include="Web References/WebS/Reference.map">
+      <publishTime>05/06/2024 08:56:50</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>06/28/2021 10:34:52</publishTime>
+      <publishTime>08/22/2024 11:12:47</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 2667c8e..0b0c1a7 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
 		<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
 		<!--<add key="FileIP" value="http://localhost:8080/" />-->
 		<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
-		<!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--><!--棰滃彴寮忔満-->
+		<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--棰滃彴寮忔満-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
 		<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
 		<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->	<!--娴嬭瘯鏈嶅姟鍣�-->
 		<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    鏈湴-->
 		<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->	<!--闄堥洴闈欐湰鍦伴厤缃�-->
-		<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>	<!--缈佹稕娑涙湰鍦伴厤缃�-->
+		<!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>-->	<!--缈佹稕娑涙湰鍦伴厤缃�-->
 		<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
 		<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
 		
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c1e72b5..b4431a4 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,13 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile21.pubxml</NameOfLastUsedPublishProfile>
+<<<<<<< HEAD
+    <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile21.pubxml</NameOfLastUsedPublishProfile>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+=======
+    <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 59bb46a..700d9e9 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index e05d33b..c6b4d80 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 92fbd28..2982c4e 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 387496a..4e59507 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/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 2542fae..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index b45cbe2..09317e3 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 22b886e..8cd2796 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,39 +1,6 @@
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\娴嬭瘯\閽夐拤娴嬭瘯\娴嬭瘯椤圭洰2\sdk_dingding\topSDK\obj\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-=======
->>>>>>> 5c681da4317f7267921689c0015a89d07dffdc23
->>>>>>> d63bbcbae24d318011ac68cef3955fbaf88c4274
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
new file mode 100644
index 0000000..6bd410c
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 59bb46a..700d9e9 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index e05d33b..c6b4d80 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 444eaec..a74353c 100644
--- a/sdk_dingding/TopSdk/obj/Release/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.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index 1d0745a..b33254c 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,6 @@
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\GIT浠撳簱\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 92fbd28..2982c4e 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 387496a..4e59507 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1