From bc9c2dfd66ab771176bd42eab9bf5c217f72a727 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 04 六月 2025 14:23:44 +0800
Subject: [PATCH] 工序导入

---
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt    |   26 --
 BLL/bin/Release/DAL.dll                                                |    0 
 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 
 SyntacticSugar/bin/Debug/SyntacticSugar.pdb                            |    0 
 WebAPI/WebAPI.csproj.user                                              |    4 
 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 
 SyntacticSugar/obj/Debug/SyntacticSugar.dll                            |    0 
 DBUtility/bin/Release/Pub_Control.dll                                  |    0 
 Model/bin/Release/SQLHelper.pdb                                        |    0 
 DAL/bin/Release/Pub_Control.pdb                                        |    0 
 DAL/bin/Release/DAL.pdb                                                |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache    |    0 
 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 
 BLL/bin/Release/DAL.pdb                                                |    0 
 Model/bin/Release/Pub_Class.pdb                                        |    0 
 BLL/bin/Release/Model.pdb                                              |    0 
 DAL/bin/Release/DAL.dll                                                |    0 
 SyntacticSugar/bin/Debug/SyntacticSugar.dll                            |    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 
 BLL/bin/Release/BLL.pdb                                                |    0 
 DBUtility/bin/Release/DBUtility.pdb                                    |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources                 |    0 
 DBUtility/bin/Release/DBUtility.dll                                    |    0 
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt  |    8 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                               |    0 
 Model/bin/Release/Pub_Control.dll                                      |    0 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache         |    0 
 Pub_Control/bin/Release/Pub_Class.pdb                                  |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user          |  494 +++++++++++++++++++++++++++++++++++++++++++++++++
 WebAPI/Controllers/BaseSet/Gy_ProcessController.cs                     |    9 
 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb                             |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt       |   15 -
 Pub_Control/bin/Release/Pub_Class.dll                                  |    0 
 SyntacticSugar/obj/Debug/SyntacticSugar.pdb                            |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                               |    0 
 BLL/bin/Release/Pub_Control.pdb                                        |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources             |    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.Xt_CheckItem.resources                 |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache         |    0 
 DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources                |    0 
 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 
 BLL/bin/Release/DBUtility.dll                                          |    0 
 BLL/bin/Release/BLL.dll                                                |    0 
 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 
 DBUtility/bin/Release/SQLHelper.dll                                    |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt     |    9 
 Model/obj/Release/Model.csproj.AssemblyReference.cache                 |    0 
 Model/bin/Release/Model.pdb                                            |    0 
 DBUtility/bin/Release/SQLHelper.pdb                                    |    0 
 DBUtility/obj/Release/DBUtility.Xt_BillType.resources                  |    0 
 DAL/bin/Release/Pub_Class.dll                                          |    0 
 Model/bin/Release/Pub_Class.dll                                        |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources            |    0 
 Model/bin/Release/Model.dll                                            |    0 
 /dev/null                                                              |    0 
 DBUtility/bin/Release/Pub_Class.pdb                                    |    0 
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache |    0 
 BLL/bin/Release/Pub_Class.pdb                                          |    0 
 Model/bin/Release/SQLHelper.dll                                        |    0 
 91 files changed, 505 insertions(+), 60 deletions(-)

diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index d3a7dfc..906a583 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index b88663e..949f71a 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 96cbe56..5b2a413 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 9829553..3052158 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index 7c68153..dd5d883 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 112188a..bd07cc8 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 0dff727..a432741 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 fe9c391..4807b2f 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 d89bf5f..3d756c7 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 78d87a8..9e73d22 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 96cbe56..5b2a413 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 9829553..3052158 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index 7c68153..dd5d883 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 112188a..bd07cc8 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 0dff727..a432741 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 fe9c391..4807b2f 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 d89bf5f..3d756c7 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 78d87a8..9e73d22 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 7c68153..dd5d883 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 112188a..bd07cc8 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 d89bf5f..3d756c7 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 78d87a8..9e73d22 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index 84a963f..552e300 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index c65df75..561c1c7 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index 1d9a8a4..9103b7d 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index fd5a993..fe71e8f 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index c8139ba..ae4f855 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 3bb77bc..89f77dc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 9fc90b8..a343328 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.dll b/DBUtility/obj/Release/DBUtility.dll
index 7c68153..dd5d883 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 112188a..bd07cc8 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 7c68153..dd5d883 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 112188a..bd07cc8 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 0dff727..a432741 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 fe9c391..4807b2f 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 d89bf5f..3d756c7 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 78d87a8..9e73d22 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 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 45bf500..df3f5ec 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 0dff727..a432741 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 fe9c391..4807b2f 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 d89bf5f..3d756c7 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 78d87a8..9e73d22 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 1a293f0..9a56b43 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 f6148b1..953c5f0 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 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 4e99941..f9881f7 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 e32cc80..b9085c9 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 b39e0eb..0e3bf9b 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 95849dc..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index be6ecd0..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 073b9d4..0000000
--- a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index fea44e6..206fb8c 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index ff0b595..9082937 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,30 +1,6 @@
-<<<<<<< HEAD
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-=======
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-=======
-D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
->>>>>>> 4a706955f6250fd50961dcde68c873f4d32a391e
->>>>>>> edcd7574e709748c5d3ccc0bd54930414ddcfc9a
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 95849dc..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index be6ecd0..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index d7e7f05..97979d2 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-=======
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
->>>>>>> edcd7574e709748c5d3ccc0bd54930414ddcfc9a
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index 125c904..baf872b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -482,7 +482,14 @@
                     }
                     else
                     {
-                        oCN.RunProc("	update  Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "'  where HNumber='" + HProcessNum + "'");
+                        if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+                        {
+                            oCN.RunProc("	update  Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "'  where HNumber='" + HProcessName + "'");
+                        }
+                        else
+                        {
+                            oCN.RunProc("	update  Gy_Process set HWorkCenterID=" + HWorkCenterID + ",HDeptID=" + HDeptID + ",HQCSchemeID_Fst=" + HQCSchemeID_Fst + ",HQCSchemeID_Proc=" + HQCSchemeID_Proc + ",HQCSchemeID_Patrol=" + HQCSchemeID_Patrol + ",HProcType = '" + HProcType + "'  where HNumber='" + HProcessNum + "'");
+                        }
                     }
 
                     i++;
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
index a32fee2..9e42806 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -3,4 +3,496 @@
 https://go.microsoft.com/fwlink/?LinkID=208121. 
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
+  <PropertyGroup>
+    <History>True|2025-06-04T05:26:20.8238933Z;False|2025-06-04T13:25:43.1503457+08:00;</History>
+    <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYAPI</_PublishTargetUrl>
+  </PropertyGroup>
+  <ItemGroup>
+    <File Include="apiapp.json">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+      <publishTime>04/07/2020 16:33:48</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+      <publishTime>04/25/2023 17:49:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+      <publishTime>07/31/2024 20:50:30</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+      <publishTime>08/06/2024 18:07:52</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+      <publishTime>11/22/2022 11:24:18</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+      <publishTime>08/08/2024 19:43:22</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaUtil.dll">
+      <publishTime>07/15/2024 20:25:56</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaXML.dll">
+      <publishTime>08/03/2022 21:46:08</publishTime>
+    </File>
+    <File Include="bin/Aliyun.Credentials.dll">
+      <publishTime>07/24/2024 10:36:58</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.dll">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.pdb">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/BLL.dll">
+      <publishTime>06/04/2025 13:26:02</publishTime>
+    </File>
+    <File Include="bin/BLL.pdb">
+      <publishTime>06/04/2025 13:26:02</publishTime>
+    </File>
+    <File Include="bin/BouncyCastle.Crypto.dll">
+      <publishTime>12/18/2020 05:32:28</publishTime>
+    </File>
+    <File Include="bin/DAL.dll">
+      <publishTime>06/04/2025 13:26:00</publishTime>
+    </File>
+    <File Include="bin/DAL.pdb">
+      <publishTime>06/04/2025 13:26:00</publishTime>
+    </File>
+    <File Include="bin/Dapper.dll">
+      <publishTime>07/22/2016 22:52:40</publishTime>
+    </File>
+    <File Include="bin/DBUtility.dll">
+      <publishTime>06/04/2025 13:25:55</publishTime>
+    </File>
+    <File Include="bin/DBUtility.pdb">
+      <publishTime>06/04/2025 13:25:55</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.dll">
+      <publishTime>03/22/2022 13:17:26</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.pdb">
+      <publishTime>03/19/2022 07:39:42</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.dll">
+      <publishTime>03/22/2022 13:17:20</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.pdb">
+      <publishTime>03/19/2022 07:39:48</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.dll">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+      <publishTime>03/19/2015 01: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>
+    </File>
+    <File Include="bin/Model.dll">
+      <publishTime>06/04/2025 13:25:56</publishTime>
+    </File>
+    <File Include="bin/Model.pdb">
+      <publishTime>06/04/2025 13:25:56</publishTime>
+    </File>
+    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+      <publishTime>04/06/2023 15:57:02</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>
+    </File>
+    <File Include="bin/NPOI.OOXML.dll">
+      <publishTime>10/23/2021 09:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.dll">
+      <publishTime>10/23/2021 09: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.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.dll">
+      <publishTime>06/04/2025 13:25:51</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.pdb">
+      <publishTime>06/04/2025 13:25:51</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.dll">
+      <publishTime>06/04/2025 13:25:54</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.pdb">
+      <publishTime>06/04/2025 13:25:54</publishTime>
+    </File>
+    <File Include="bin/RestSharp.dll">
+      <publishTime>08/31/2012 06:22:50</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.dll">
+      <publishTime>06/04/2025 13:25:54</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.pdb">
+      <publishTime>06/04/2025 13:25:54</publishTime>
+    </File>
+    <File Include="bin/Swashbuckle.Core.dll">
+      <publishTime>02/16/2015 01:57:08</publishTime>
+    </File>
+    <File Include="bin/SyntacticSugar.dll">
+      <publishTime>06/04/2025 13:25:49</publishTime>
+    </File>
+    <File Include="bin/SyntacticSugar.pdb">
+      <publishTime>06/04/2025 13:25:49</publishTime>
+    </File>
+    <File Include="bin/System.Buffers.dll">
+      <publishTime>07/19/2017 18:01:28</publishTime>
+    </File>
+    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Configuration.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.DataSetExtensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Drawing.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.EnterpriseServices.dll">
+      <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>
+    </File>
+    <File Include="bin/System.Memory.dll">
+      <publishTime>04/18/2019 00: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/20/2015 04:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Formatting.dll">
+      <publishTime>11/28/2018 21: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>
+    </File>
+    <File Include="bin/System.Runtime.Serialization.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.ApplicationServices.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Cors.dll">
+      <publishTime>11/28/2018 20:58:44</publishTime>
+    </File>
+    <File Include="bin/System.Web.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.DynamicData.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Entity.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Extensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Helpers.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.Cors.dll">
+      <publishTime>11/28/2018 21:01:26</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.dll">
+      <publishTime>11/28/2018 21:01:00</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.WebHost.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="bin/System.Web.Mvc.dll">
+      <publishTime>01/28/2015 12:02:18</publishTime>
+    </File>
+    <File Include="bin/System.Web.Optimization.dll">
+      <publishTime>02/11/2014 23:26:04</publishTime>
+    </File>
+    <File Include="bin/System.Web.Razor.dll">
+      <publishTime>01/28/2015 12: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>
+    </File>
+    <File Include="bin/System.Web.WebPages.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.Razor.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Xml.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <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 10:43:40</publishTime>
+    </File>
+    <File Include="bin/TopSdk.dll">
+      <publishTime>06/04/2025 13:25:55</publishTime>
+    </File>
+    <File Include="bin/TopSdk.pdb">
+      <publishTime>06/04/2025 13:25:55</publishTime>
+    </File>
+    <File Include="bin/WebActivatorEx.dll">
+      <publishTime>11/24/2014 19:18:48</publishTime>
+    </File>
+    <File Include="bin/WebAPI.dll">
+      <publishTime>06/04/2025 13:26:12</publishTime>
+    </File>
+    <File Include="bin/WebAPI.pdb">
+      <publishTime>06/04/2025 13:26:12</publishTime>
+    </File>
+    <File Include="bin/WebAPI.XmlSerializers.dll">
+      <publishTime>06/04/2025 13:26:18</publishTime>
+    </File>
+    <File Include="bin/WebGrease.dll">
+      <publishTime>07/18/2013 01:03:52</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+      <publishTime>11/29/2018 21:26:02</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+      <publishTime>11/29/2018 21:26:30</publishTime>
+    </File>
+    <File Include="Config/kdapi.config">
+      <publishTime>04/06/2023 15:57:01</publishTime>
+    </File>
+    <File Include="Content/bootstrap.css">
+      <publishTime>04/06/2023 15:57:01</publishTime>
+    </File>
+    <File Include="Content/bootstrap.min.css">
+      <publishTime>04/06/2023 15:57:01</publishTime>
+    </File>
+    <File Include="Content/Site.css">
+      <publishTime>04/06/2023 15:57:01</publishTime>
+    </File>
+    <File Include="DLL/BLL.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/DAL.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/DBUtility.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/Model.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/Newtonsoft.Json.Net35.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/Pub_Class.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/Pub_Control.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/SQLHelper.dll">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.eot">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.svg">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.ttf">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.woff">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Global.asax">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="Index.html">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="libman.json">
+      <publishTime>07/12/2023 08:14:21</publishTime>
+    </File>
+    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="packages.config">
+      <publishTime>09/19/2024 10:10:46</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.min.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.map">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.min.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Scripts/modernizr-2.6.2.js">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Shared/Error.cshtml">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/Shared/_Layout.cshtml">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/web.config">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Views/_ViewStart.cshtml">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Web.config">
+      <publishTime>06/04/2025 13:26:18</publishTime>
+    </File>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 34b9d1c..47ccf40 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,9 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile11.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index ec122d5..117557e 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 88b4e7f..278dfa9 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 a7e42c4..9260da5 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 0a5bf1c..46c09d8 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 579a602..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 b4d1a01..b3a6f35 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index a51f78e..cdbf68a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,19 +1,6 @@
-<<<<<<< HEAD
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
->>>>>>> edcd7574e709748c5d3ccc0bd54930414ddcfc9a
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index ec122d5..117557e 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 88b4e7f..278dfa9 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
deleted file mode 100644
index 2eafeb3..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index e1f1a0d..dd9e641 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,14 +1,5 @@
-<<<<<<< HEAD
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-=======
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
->>>>>>> edcd7574e709748c5d3ccc0bd54930414ddcfc9a
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index a7e42c4..9260da5 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 0a5bf1c..46c09d8 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1