From db047f20127c25c22853331dd9cbfd307fd2df68 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 06 五月 2026 16:18:01 +0800
Subject: [PATCH] 1

---
 DAL/质检管理/ClsQC_FirstPieceCheckBill.cs                                    |   35 ++
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt      |   10 
 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 
 SyntacticSugar/bin/Release/SyntacticSugar.dll                            |    0 
 DAL/bin/Release/DBUtility.pdb                                            |    0 
 DAL/bin/Release/Model.dll                                                |    0 
 DBUtility/bin/Release/Pub_Class.dll                                      |    0 
 SyntacticSugar/bin/Release/SyntacticSugar.pdb                            |    0 
 SyntacticSugar/obj/Debug/SyntacticSugar.dll                              |    0 
 WebAPI/App_Start/WebApiConfig.cs                                         |   10 
 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 
 WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs          |  196 ++++++++++++++++
 Model/bin/Release/Pub_Control.pdb                                        |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb                               |    0 
 Model/bin/Release/Pub_Class.pdb                                          |    0 
 DAL/bin/Release/DAL.dll                                                  |    0 
 SyntacticSugar/bin/Debug/SyntacticSugar.dll                              |    0 
 WebAPI/Controllers/基础资料/基础资料/Gy_CostItemController.cs                    |   42 +-
 DAL/bin/Release/Model.pdb                                                |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll                                 |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.dll                               |    0 
 Pub_Class/bin/Release/SyntacticSugar.pdb                                 |    0 
 sdk_dingding/TopSdk/bin/Release/TopSdk.dll                               |    0 
 DBUtility/bin/Release/DBUtility.pdb                                      |    0 
 WebAPI/packages.config                                                   |    1 
 DBUtility/bin/Release/DBUtility.dll                                      |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                                 |    0 
 Pub_Class/bin/Release/SyntacticSugar.dll                                 |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache    |    1 
 Model/bin/Release/Pub_Control.dll                                        |    0 
 WarM/条码打印/Gy_BarCodeBill_Rework.cs                                       |    5 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache    |    0 
 Pub_Control/bin/Release/Pub_Class.pdb                                    |    0 
 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb                               |    0 
 Pub_Control/bin/Release/Pub_Class.dll                                    |    0 
 SyntacticSugar/obj/Debug/SyntacticSugar.pdb                              |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                                 |    0 
 WebAPI/Controllers/成本管理/CB_ItemMoneyBillController.cs                    |   25 -
 WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user                  |   44 +-
 WebAPI/WebAPI.csproj                                                     |    3 
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache |    0 
 Pub_Class/bin/Release/Pub_Class.pdb                                      |    0 
 Pub_Control/bin/Release/Pub_Control.dll                                  |    0 
 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs                     |    8 
 DAL/bin/Release/SQLHelper.dll                                            |    0 
 Model/bin/Release/DBUtility.pdb                                          |    0 
 SQLHelper/bin/Release/SQLHelper.dll                                      |    0 
 SyntacticSugar/obj/Release/SyntacticSugar.dll                            |    0 
 WebAPI/Controllers/条码管理/WEBSController.cs                                |  244 ++++++++-----------
 SQLHelper/bin/Release/Pub_Class.pdb                                      |    0 
 Pub_Class/bin/Release/Pub_Class.dll                                      |    0 
 SyntacticSugar/obj/Release/SyntacticSugar.pdb                            |    0 
 DAL/bin/Release/SQLHelper.pdb                                            |    0 
 SQLHelper/bin/Release/Pub_Class.dll                                      |    0 
 SQLHelper/bin/Release/SQLHelper.pdb                                      |    0 
 Model/bin/Release/DBUtility.dll                                          |    0 
 DAL/bin/Release/Pub_Class.pdb                                            |    0 
 Pub_Control/bin/Release/Pub_Control.pdb                                  |    0 
 WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs        |   73 ++++++
 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb                                 |    0 
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache |    1 
 DBUtility/bin/Release/SQLHelper.dll                                      |    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 
 DBUtility/bin/Release/Pub_Class.pdb                                      |    0 
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache   |    0 
 Model/bin/Release/SQLHelper.dll                                          |    0 
 77 files changed, 489 insertions(+), 209 deletions(-)

diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
new file mode 100644
index 0000000..466dd78
--- /dev/null
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
new file mode 100644
index 0000000..3aa15b0
--- /dev/null
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
new file mode 100644
index 0000000..0e4c9f5
--- /dev/null
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
new file mode 100644
index 0000000..f132dbf
--- /dev/null
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
new file mode 100644
index 0000000..69b15e4
--- /dev/null
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
new file mode 100644
index 0000000..0e4ebc2
--- /dev/null
+++ 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
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3e553b4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ae7f914
--- /dev/null
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
new file mode 100644
index 0000000..02f62e7
--- /dev/null
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
new file mode 100644
index 0000000..dac673b
--- /dev/null
+++ 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_FirstPieceCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
index 24a09bb..461bd7a 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
@@ -554,9 +554,42 @@
             }
         }
 
+        /// <summary>
+        /// 椹冲洖鍗曟嵁锛屽厛淇濆瓨椹冲洖鍘熷洜鍒癏Remark锛岀劧鍚庢墽琛屽師鏈夐┏鍥炴祦绋�
+        /// </summary>
+        /// <param name="lngBillKey">鍗曟嵁ID</param>
+        /// <param name="HRemark">椹冲洖鍘熷洜</param>
+        /// <param name="CurUserID">褰撳墠鐢ㄦ埛ID</param>
+        /// <param name="sReturn">杩斿洖淇℃伅</param>
+        /// <returns></returns>
+        public bool RejectWithReason(Int64 lngBillKey, string HRemark, string CurUserID, ref string sReturn)
+        {
+            try
+            {
+                // 1. 鍏堟洿鏂癏Remark锛屼繚瀛橀┏鍥炲師鍥狅紙RejectCheckFlowProgress鍐呴儴浼氬鐞嗕簨鍔★級
+                string sql = "Update QC_FirstPieceCheckBillMain set " +
+                             " HRemark = '" + HRemark.Replace("'", "''") + "'," +
+                             " HUpDater = '" + DBUtility.ClsPub.CurUserName + "'," +
+                             " HUpDateDate = getdate()" +
+                             " where HInterID = " + lngBillKey.ToString();
 
+                oCn.RunProc(sql);
 
+                // 2. 鎵ц鍘熸湁椹冲洖娴佺▼锛堢户鎵胯嚜鍩虹被鐨勯┏鍥炴祦绋嬪鐞嗭紝鍐呴儴宸插寘鍚簨鍔″鐞嗭級
+                if (!this.RejectCheckFlowProgress(lngBillKey, this.omodel.HBillNo, CurUserID, ref sReturn))
+                {
+                    return false;
+                }
 
-        
+                sReturn = "椹冲洖鎴愬姛";
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                return false;
+            }
+        }
+
     }
 }
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
new file mode 100644
index 0000000..0e4c9f5
--- /dev/null
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
new file mode 100644
index 0000000..f132dbf
--- /dev/null
+++ 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
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3e553b4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ae7f914
--- /dev/null
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
new file mode 100644
index 0000000..02f62e7
--- /dev/null
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
new file mode 100644
index 0000000..dac673b
--- /dev/null
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
new file mode 100644
index 0000000..0e4c9f5
--- /dev/null
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
new file mode 100644
index 0000000..f132dbf
--- /dev/null
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
new file mode 100644
index 0000000..69b15e4
--- /dev/null
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
new file mode 100644
index 0000000..0e4ebc2
--- /dev/null
+++ 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
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3e553b4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ae7f914
--- /dev/null
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
new file mode 100644
index 0000000..02f62e7
--- /dev/null
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
new file mode 100644
index 0000000..dac673b
--- /dev/null
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..874230f
--- /dev/null
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..32b7fb9
--- /dev/null
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3e553b4
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ae7f914
--- /dev/null
+++ 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
new file mode 100644
index 0000000..140ab5f
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2b72683
--- /dev/null
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
new file mode 100644
index 0000000..02f62e7
--- /dev/null
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
new file mode 100644
index 0000000..dac673b
--- /dev/null
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index a7e7f70..d8e48a9 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 75e66e8..9679f05 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..874230f
--- /dev/null
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..32b7fb9
--- /dev/null
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ 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 a728730..abdfb7b 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -19,10 +19,20 @@
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
 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
+<<<<<<< HEAD
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+>>>>>>> b96dd44760e07a20de9cd28f6daf0deccdf0705c
+=======
 D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
 D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index a7e7f70..d8e48a9 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 75e66e8..9679f05 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..fea44e6
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..bfb772c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..874230f
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..32b7fb9
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 82daf9f..3ade459 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -709,11 +709,12 @@
                                     string[] HMaterNumberPrefix = oSystemParameter.omodel.Gy_BarCodeBill_Rework_Ctrl.Split(',');
 
                                     char HMaterfirstChar = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString()[0];
+                                    string HMaterthirdChar = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString().Substring(0,3);
 
                                     if (HMaterNumberPrefix.Contains(HMaterfirstChar.ToString()))
                                     {
-                                        //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
-                                        TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
+                                        //鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鐗╂枡浠ｇ爜鍓嶄笁浣� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
+                                        TM = "1" + "060113" + HMaterthirdChar.ToString() + sYear + sPeriod + sDay + LSH.ToString("D5");
                                     }
                                     else
                                     {
diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index f8394af..3d02acc 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -31,12 +31,16 @@
                 defaults: new { id = RouteParameter.Optional }
             );
             // 娉ㄥ唽绛惧悕
-            // config.Filters.Add(new SignatureVerifyAttribute());
+            //config.Filters.Add(new SignatureVerifyAttribute());
             //// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
-            // config.Filters.Add(new JwtAuthorizeAttribute());
+            //config.Filters.Add(new JwtAuthorizeAttribute());
 
             //// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
-            // config.MessageHandlers.Add(new TokenAppendHandler());
+            //config.MessageHandlers.Add(new TokenAppendHandler());
+
+
+
+
         }
     }
 }
diff --git a/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs b/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs
index f0801b2..91ad16c 100644
--- a/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs
+++ b/WebAPI/Controllers/PM_ProjectCommunicationBillListController.cs
@@ -173,8 +173,7 @@
                 }
                 else
                 {
-                    //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
-                    oCN.BeginTran();
+
                     //涓昏〃
                     oCN.RunProc("Update PM_ProjectCommunicationBillMain" + " set " +
                     " HProSituation='" + list[0].HProSituation + "'" +
@@ -239,5 +238,198 @@
                 return objJsonResult;
             }
         }
+
+        #region  鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("PM_ProjectCommunicationBillList/delete")]
+        [HttpGet]
+        public object delete(string HInterID, string user)
+        {
+            try
+            {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_delete", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                oCN.RunProc("delete from PM_ProjectCommunicationBillMain where HInterID = " + HInterID);
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+        #region  瀹℃牳/鍙嶅鏍�
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("PM_ProjectCommunicationBillList/AuditPM_ProjectCommunicationBillList")]
+        [HttpGet]
+        public object AuditPM_ProjectCommunicationBillList(string HInterID, int Type, string user)
+        {
+            try
+            {
+                //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Pm_ProjectBill_Check", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (string.IsNullOrWhiteSpace(HInterID))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                ClsPub.CurUserName = user;
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+
+                //Type 1 瀹℃牳  2  鍙嶅鏍�
+                if (Type == 1)
+                {
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+                    DataSet ds;
+                    string sql = "select * from PM_ProjectCommunicationBillMain where HInterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, "PM_ProjectCommunicationBillMain");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        string sqll = $"update PM_ProjectCommunicationBillMain set HChecker ='{user}', HCheckDate=GETDATE(),HBillStatus=2 where HInterID={HInterID} ";
+                        oCN.RunProc(sqll);
+                    }
+                }
+                else
+                {
+                    //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+                    DataSet ds;
+                    string sql = "select * from PM_ProjectCommunicationBillMain where HInterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, "PM_ProjectCommunicationBillMain");
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜鍙嶅鏍革紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍙嶅鏍革紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶅鏍稿崟鎹�
+                        string sqll = $"update PM_ProjectCommunicationBillMain set HChecker ='',HBillStatus=1 where HInterID={HInterID} ";
+                        oCN.RunProc(sqll);
+                    }
+                }
+
+                oCN.Commit();//鎻愪氦浜嬪姟
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎵ц鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult; ;
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index a135386..ac13351 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -540,13 +540,13 @@
                             break;
                         case "1103": //鏀舵枡閫氱煡鍗�
                             //寰楀埌淇℃伅
-                            // ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
-                            ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList_Source where 鍙敓鎴愭潯鐮佹暟閲� > 0 and hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockBillList_Source");
+                             ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+                            //ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList_Source where 鍙敓鎴愭潯鐮佹暟閲� > 0 and hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockBillList_Source");
 
 
                             //鍐欏叆淇℃伅
-                            //ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
-                            ListRows.Add(HSourceOrderList2(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+                            ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+                            //ListRows.Add(HSourceOrderList2(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
                             break;
                         case "1601": //濮斿璁㈠崟
                             //寰楀埌淇℃伅
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 0f79821..4ad628a 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -1966,6 +1966,79 @@
         }
         #endregion
 
+        #region 棣栦欢妫�楠屽崟椹冲洖(甯﹀師鍥狅紝淇濆瓨鍒癏Remark)
+        [Route("QC_FirstPieceCheckBill/RejectWithReason")]
+        [HttpGet]
+        public object RejectWithReason(string HInterID, string HRemark, string CurUserID)
+        {
+            try
+            {
+                Int64 lngBillKey = 0;
+                lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+                DAL.ClsQC_FirstPieceCheckBill oBill = new DAL.ClsQC_FirstPieceCheckBill();
+                //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇棣栦欢妫�楠屽崟鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+                string sReturn = "";
+                if (oSystemParameter.ShowBill(ref sReturn) == true)
+                {
+                    if (oSystemParameter.omodel.QC_FirstPieceCheckBill_EnableMultiLevel.ToUpper() == "N")
+                    {
+                        objJsonResult.code = CodeConstant.FAIL;
+                        objJsonResult.count = CountConstant.FAIL;
+                        objJsonResult.Message = "棣栦欢妫�楠屽崟鏈惎鐢ㄥ绾у鎵圭鐢�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+                {
+                    if (oBill.omodel.HBillStatus != 6)
+                    {
+                        objJsonResult.code = CodeConstant.FAIL;
+                        objJsonResult.count = CountConstant.FAIL;
+                        objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳介┏鍥�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //鍏堜繚瀛橀┏鍥炲師鍥犲埌HRemark锛屽啀鎵ц椹冲洖
+                    if (oBill.RejectWithReason(lngBillKey, HRemark, CurUserID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = CodeConstant.SUCCEED;
+                        objJsonResult.count = CountConstant.SUCCEED;
+                        objJsonResult.Message = "椹冲洖鎴愬姛";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = CodeConstant.FAIL;
+                        objJsonResult.count = CountConstant.FAIL;
+                        objJsonResult.Message = "椹冲洖澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = CodeConstant.FAIL;
+                    objJsonResult.count = CountConstant.FAIL;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = CodeConstant.FAIL;
+                objJsonResult.count = CountConstant.FAIL;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region 棣栦欢妫�楠屽崟 鍙戣捣瀹℃壒
         [Route("QC_FirstPieceCheckBill/StartCheckFlow")]
         [HttpGet]
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_CostItemController.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_CostItemController.cs"
index bf0c0ad..cc59e05 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_CostItemController.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_CostItemController.cs"
@@ -675,27 +675,27 @@
                             return objJsonResult;
                         }
                         //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
-                        string sParent;
-                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
-                        if (sParent.Trim() == "")
-                        {
-                            oBill.oModel.HParentID = 0;
-                        }
-                        else
-                        {
-                            if (oBill.HavParentCode(sParent.Trim(), HItemID))
-                            {
-                                oBill.oModel.HParentID = oBill.oModel.HItemID;
-                            }
-                            else
-                            {
-                                objJsonResult.code = "0";
-                                objJsonResult.count = 0;
-                                objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
-                                objJsonResult.data = 1;
-                                return objJsonResult;
-                            }
-                        }
+                        //string sParent;
+                        //sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+                        //if (sParent.Trim() == "")
+                        //{
+                        //    oBill.oModel.HParentID = 0;
+                        //}
+                        //else
+                        //{
+                        //    if (oBill.HavParentCode(sParent.Trim(), HItemID))
+                        //    {
+                        //        oBill.oModel.HParentID = oBill.oModel.HItemID;
+                        //    }
+                        //    else
+                        //    {
+                        //        objJsonResult.code = "0";
+                        //        objJsonResult.count = 0;
+                        //        objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+                        //        objJsonResult.data = 1;
+                        //        return objJsonResult;
+                        //    }
+                        //}
                     }
                     else//缂栬緫鏃跺垽鏂�
                     {
diff --git "a/WebAPI/Controllers/\346\210\220\346\234\254\347\256\241\347\220\206/CB_ItemMoneyBillController.cs" "b/WebAPI/Controllers/\346\210\220\346\234\254\347\256\241\347\220\206/CB_ItemMoneyBillController.cs"
index e4cf686..e628977 100644
--- "a/WebAPI/Controllers/\346\210\220\346\234\254\347\256\241\347\220\206/CB_ItemMoneyBillController.cs"
+++ "b/WebAPI/Controllers/\346\210\220\346\234\254\347\256\241\347\220\206/CB_ItemMoneyBillController.cs"
@@ -1286,12 +1286,6 @@
                     errorMessage.Append("锛�");
                 }
 
-                if (missingMaterialMessages.Any())
-                {
-                    errorMessage.Append("浠ヤ笅鐗╂枡鏈淮鎶わ細");
-                    errorMessage.Append(string.Join("銆�", missingMaterialMessages));
-                    errorMessage.Append("锛�");
-                }
                 if (missingCostMessages.Any())
                 {
                     errorMessage.Append("鎴愭湰椤圭洰鏈淮鎶ゆ垨鏈夎锛�");
@@ -1304,12 +1298,7 @@
                     errorMessage.Append(string.Join("銆�", missingmoneyMessages));
                     errorMessage.Append("锛�");
                 }
-                if (missingEmployeeMessages.Any())
-                {
-                    errorMessage.Append("浠ヤ笅鑱屽憳鏈淮鎶わ細");
-                    errorMessage.Append(string.Join("銆�", missingEmployeeMessages));
-                    errorMessage.Append("锛�");
-                }
+
 
                 if (errorMessage.Length > 0)
                 {
@@ -1362,18 +1351,22 @@
                     DateTime firstDayWithTime = new DateTime(Convert.ToInt32(list[0]["骞翠唤"]), Convert.ToInt32(list[0]["鏈堜唤"]), 1);
                     // 鎻掑叆涓昏〃锛堟瘡缁勬彃鍏ヤ竴娆★級
                     insertSql.AppendLine($"INSERT INTO CB_ItemMoneyBillMain  ([HInterID], [HBillNo], [HDate], [HYear], [HPeriod], [HBillType], [HBillSubType], [HBillStatus], [HCheckItemNowID], [HCheckItemNextID], [HCheckFlowID], [HRemark], [HBacker], [HBackDate], [HBackRemark], [HChecker], [HCheckDate], [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType], [HDeleteMan], [HDeleteDate], [HMainSourceBillType], [HMainSourceInterID], [HMainSourceEntryID], [HMainSourceBillNo], [HPrintQty],  [HEmpID], [HDeptID], [HICMOInterID], [HMaterID], [HICMOBillNo], [HExplanation], [HInnerBillNo], [HBeginDate], [HEndDate], [HOrgID]) VALUES (");
-                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{firstDayWithTime}', {list[0]["骞翠唤"]}, {list[0]["鏈堜唤"]}, {"1802"}, '{"1802"}', '{"1"}',  '{"0"}', '{"0"}', '{"0"}', '{"excel瀵煎叆"}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{DateTime.Now}', '{user}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{"0"}', '{""}', '{DateTime.Now}', '{""}', '{"0"}', '{"0"}', '{""}', '{"0"}', '{EmpID}', '{HSupplierID}', '{ICMOInterID}','{0}','{ICMO}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{"100038"}');");
+                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{firstDayWithTime}', {list[0]["骞翠唤"]}, {list[0]["鏈堜唤"]}, {"1802"}, '{"1802"}', '{"1"}',  '{"0"}', '{"0"}', '{"0"}', '{"excel瀵煎叆"}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{DateTime.Now}', '{user}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{"0"}', '{""}', '{DateTime.Now}', '{""}', '{"0"}', '{"0"}', '{""}', '{"0"}', '{EmpID}', '{HSupplierID}', '{ICMOInterID}','{0}','{ICMO}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{organ}');");
 
                         // 鎻掑叆瀛愯〃锛堢粍鍐呮瘡涓墿鏂欐彃鍏ヤ竴娆★級
                         int HEntryID = 1;
                         foreach (var item in group)
                         {
-                            int HMaterID = materialDict[$"{item["鐗╂枡缂栫爜"]}_{item["鐗╂枡鍚嶇О"]}"];
+                        // 鑾峰彇鐗╂枡ID锛屽鏋滃瓧鍏镐腑涓嶅瓨鍦ㄥ搴旂殑鐗╂枡缂栫爜鍜岀墿鏂欏悕绉扮粍鍚堬紝鍒欒祴鍊间负0
+                            int HMaterID = materialDict.TryGetValue($"{item["鐗╂枡缂栫爜"]}_{item["鐗╂枡鍚嶇О"]}", out int materId)
+                                ? materId : 0;
                             int HCostID = CostDict[item["鎴愭湰椤圭洰"]];
-                            int HProcID = ProcDict[item["宸ュ簭"]];
+                            // 鑾峰彇宸ュ簭ID锛屽鏋滃瓧鍏镐腑涓嶅瓨鍦ㄥ搴旂殑宸ュ簭锛屽垯璧嬪�间负0
+int HProcID = ProcDict.TryGetValue(item["宸ュ簭"].ToString(), out int procId) 
+    ? procId : 0;
 
                             insertSql_sub.AppendLine($"INSERT INTO [CB_ItemMoneyBillSub] ([HInterID], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark],[HSourceInterID], [HSourceEntryID], [HSourceBillNo], [HSourceBillType],[HRelationQty], [HRelationMoney], [HBillNo_bak], [HCostItemID],[HDeptID], [HQty], [HPrice], [HMoney],[HMaterID], [HWaster], [HDate], [HBeginBalance], [HEndBalance], [HTimes],[HProcID]) VALUES (");
-                            insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel瀵煎叆"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{"0"}', '{"0"}', '{""}', '{HCostID}', '{HSupplierID}', '{item["鏁伴噺"]}', '{item["鍗曚环"]}', '{item["閲戦"]}','{HMaterID}', '{item["鎹熻�楅噺"] ?? "0"}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}', '{HProcID}');");
+                            insertSql_sub.AppendLine($"'{HInterID}', '{HEntryID}', '{""}', '{DateTime.Now}', '{"0"}', '{"excel瀵煎叆"}','{"0"}', '{"0"}',  '{"0"}', '{"0"}','{"0"}', '{"0"}', '{""}', '{HCostID}', '{HSupplierID}', '{(item["鏁伴噺"] == "" ? "0" : item["鏁伴噺"])}', '{(item["鍗曚环"] == "" ? "0" : item["鍗曚环"])}', '{item["閲戦"]}','{HMaterID}', '{(item["鎹熻�楅噺"]=="" ? "0" : item["鎹熻�楅噺"])}', '{DateTime.Now}', '{"0"}', '{"0"}', '{"0"}', '{HProcID}');");
                             HEntryID++;
                         }
                     
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 6f1d5d5..c360f01 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -17,7 +17,7 @@
 using WebAPI.Models;
 using WebAPI.Service;
 using WebAPI.Utility;
-using Kingdee.BOS.WebApi.Client;
+using Alex.Kingdee.Cloud.WebAPI.Client;
 
 namespace WebAPI.Controllers
 {
@@ -15585,167 +15585,100 @@
         #region 鐗╂枡鍩虹璧勬枡鍚屾
         [Route("WEBSController/MaterialDataToLocalByKDWebApi")]
         [HttpGet]
-        public object MaterialDataToLocalByKDWebApi(string HDate)
+        public object MaterialDataToLocalByKDWebApi(string HDate,int limit)
         {
+            bool hasMore = true;//鏄惁寰幆鏌ヨ
             try
             {
                 //璁块棶閲戣澏
-                ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
-                var loginRet = InvokeHelper.Login();
-                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+                string sCLOUDUseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+                string sCLOUDPsd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
+                string dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+                ApiClient client = new ApiClient(Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl"));
+                bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                 string HReturn;
+                int startRow = 0;//鍒嗛〉锛屼粠绗�1鏉″紑濮嬫煡璇�               
+                List<JObject> allData = new List<JObject>();//鎺ユ敹瀛樺偍鎵�鏈夋煡璇㈠埌鐨勬暟鎹�
 
-                if (isSuccess == 0)
+                if (!bLogin)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鍚屾鍩虹璧勬枡澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+                    objJsonResult.Message = "鍚屾鍩虹璧勬枡澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+                //瑕侀�氳繃鎺ュ彛鏌ヨ鐨勫瓧娈�
+                string fieldKeys = "FMATERIALID,FNumber,FName,FSpecification,FFORBIDSTATUS,FErpClsID,FSTOREUNITID,FLENGTH,FWIDTH,FHEIGHT,FNETWEIGHT,FGROSSWEIGHT,FOLDNUMBER,FSTOCKID,FStockPlaceID,FPLANMODE,FCREATORID,FAPPROVERID,FAPPROVEDATE,FMODIFYDATE,FCREATEORGID,FUSEORGID,FISBATCHMANAGE,FCHECKINCOMING,FISENABLE1,FISKFPERIOD,FEXPUNIT,FEXPPERIOD,FAUXUNITID,FSNUNIT,FBASEUNITID,FSALEUNITID,FSALEPRICEUNITID,FPERUNITSTANDHOUR,FSTDLABORPREPARETIME,FSTDMACHINEPREPARETIME,FMASTERID,FMAXPOQTY,FMINPOQTY,FMATERIALGROUP";
 
-                //璋冪敤鍗曟嵁鏌ヨwebapi
-                string sJson = $"{{\"FormId\":\"BD_MATERIAL\",\"FieldKeys\":\"FMATERIALID,FNumber,FName,FSpecification,FApproveDate,FCreateDate,FDocumentStatus\",\"FilterString\":\"FApproveDate >= '2025-04-01T00:00:00' AND FApproveDate <= '2025-04-30T23:59:59'\",\"Limit\":100,\"StartRow\":0,\"TopRowCount\":0}}";                
+                oCn.BeginTran();//寮�濮嬩簨鍔�
 
-                var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc", new object[] { "BD_MATERIAL", sJson });
-
-                var _saveObj = JObject.Parse(result);
-
-                //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
-                if (_saveObj.SelectToken("Result.ResponseStatus.IsSuccess")?.ToString().ToUpper() != "TRUE")
+                while (hasMore) //寰幆鍒嗙粍鏌ヨ锛岄伩鍏嶆紡鍚屾
                 {
-                    HReturn = result.ToString();
-                    //鍙嶅簭鍒楀寲json鏁版嵁
-                    var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
-                    //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
-                    var strErrorMsg = string.Empty;
-                    //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
-                    foreach (var item in retModel.Result.ResponseStatus.Errors)
-                    {
-                        strErrorMsg += item.Message + "\r\n";
-                    };
+                    //鎷兼帴鍗曟嵁鏌ヨ鎺ュ彛鍙傛暟
+                    string sJson = $"{{\"FormId\":\"BD_MATERIAL\",\"FieldKeys\":\"{fieldKeys}\",\"FilterString\":\"FApproveDate >= '{HDate}' and FLOCALEID = 2052\",\"Limit\":{limit},\"StartRow\":{startRow},\"TopRowCount\":0}}";
 
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍗曟嵁鏌ヨ鐗╂枡淇℃伅澶辫触锛�" + strErrorMsg;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    //涓昏〃鏁版嵁璧嬪��
-                    var MainData = new
-                    {
-                        HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
-                        HDate = _saveObj.SelectToken("Result.Result.Date")?.ToString(),
-                        HBillNo = _saveObj.SelectToken("Result.Result.BillNo")?.ToString() ?? "",
-                        HBillStatus = _saveObj.SelectToken("Result.Result.ApproverId_Id")?.ToString() == "0" ? 1 : 2,
-                        HPURCHASERNumber = _saveObj.SelectToken("Result.Result.PurchaserId.Number")?.ToString() ?? "",
-                        HMaker = _saveObj.SelectToken("Result.Result.CreatorId.Name")?.ToString() ?? "",
-                        HChecker = _saveObj.SelectToken("Result.Result.ApproverId.Name")?.ToString() ?? "",
-                        HUpDater = _saveObj.SelectToken("Result.Result.ModifierId.Name")?.ToString() ?? "",
-                        HDeleteMan = _saveObj.SelectToken("Result.Result.CancellerId.Name")?.ToString() ?? "",
-                        HCloseMan = _saveObj.SelectToken("Result.Result.CloserId.Name")?.ToString() ?? "",
-                        HPURCHASERGROUPNumber = _saveObj.SelectToken("Result.Result.PurchaserGroupId.Number")?.ToString() ?? "",
-                        HPROVIDERCONTACTNumber = _saveObj.SelectToken("Result.Result.ProviderContactId.CONTACTNUMBER")?.ToString() ?? "",
-                        HSETTLEMODEID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleModeId_Id")?.ToString() ?? "0",
-                        HSETTLEMODENumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleModeId.Number")?.ToString() ?? "",
-                        HSETTLECURRID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleCurrId_Id")?.ToString() ?? "0",
-                        HSETTLECURRNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].SettleCurrId.Number")?.ToString() ?? "",
-                        HEXCHANGETYPEID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeTypeId_Id")?.ToString() ?? "0",
-                        HEXCHANGETYPENumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeTypeId.Number")?.ToString() ?? "",
-                        HPAYCONDITIONID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].PayConditionId_Id")?.ToString() ?? "0",
-                        HPAYCONDITIONNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].PayConditionId.Number")?.ToString() ?? "",
-                        HEXCHANGERATE = _saveObj.SelectToken("Result.Result.POOrderFinance[0].ExchangeRate")?.ToString() ?? "0",
-                        HLOCALCURRID = _saveObj.SelectToken("Result.Result.POOrderFinance[0].LocalCurrId_Id")?.ToString() ?? "0",
-                        HLOCALCURRNumber = _saveObj.SelectToken("Result.Result.POOrderFinance[0].LocalCurrId.Number")?.ToString() ?? "",
-                        HISINCLUDEDTAX = _saveObj.SelectToken("Result.Result.POOrderFinance[0].IsIncludedTax")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
-                        HISPRICEEXCLUDETAX = _saveObj.SelectToken("Result.Result.POOrderFinance[0].FISPRICEEXCLUDETAX")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
-                    };
+                    //璋冪敤閲戣澏webapi鍗曟嵁鏌ヨ鎺ュ彛
+                    var HReurnData = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery",
+                    new object[] { sJson });
 
-                    //鏍规嵁鍗曟嵁鍙枫�佸崟鎹甀D锛屽垹闄ゆ湰鍦版暟鎹�
-                    oCn.RunProc("Delete from Cg_POOrderBillMain where HBillNo='" + MainData.HBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
-                    oCn.RunProc("Delete from Cg_POOrderBillMain where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
-                    oCn.RunProc("Delete from Cg_POOrderBillSub where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
-                   
-                    //瀛愯〃鏁版嵁璧嬪��
-                    var dataArr = _saveObj.SelectToken("Result.Result.POOrderEntry") as JArray;
+                    //灏嗛噾铦跺崟鎹煡璇EBAPI鎺ュ彛杩斿洖鐨勭函鏁扮粍杞崲涓哄甫瀛楁鍚嶇殑瀵硅薄鍒楄〃
+                    JArray formattedData = ConvertKingdeeResultToObjects(HReurnData, fieldKeys);
 
-                    if (dataArr != null)
+                    if (formattedData.Count < limit)
                     {
-                        foreach (var oSub in dataArr)
-                        {
-                            var SubData = new
-                            {
-                                HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
-                                HEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
-                                HMaterID = oSub.SelectToken("MaterialId_Id")?.ToString() ?? "0",
-                                HUnitID = oSub.SelectToken("UnitId_Id")?.ToString() ?? "0",
-                                HQty = oSub.SelectToken("Qty")?.ToString() ?? "0",
-                                HPrice = oSub.SelectToken("Price")?.ToString() ?? "0",
-                                HTaxPrice = oSub.SelectToken("TaxPrice")?.ToString() ?? "0",
-                                HDiscountRate = oSub.SelectToken("DiscountRate")?.ToString() ?? "0",
-                                HMoney = oSub.SelectToken("Amount")?.ToString() ?? "0",
-                                HTaxRate = oSub.SelectToken("TaxRate")?.ToString() ?? "0",
-                                HTaxMoney = oSub.SelectToken("TaxAmount")?.ToString() ?? "0",
-                                HDate = oSub.SelectToken("DeliveryDate")?.ToString() ?? "",
-                                HRemark = oSub.SelectToken("Note")?.ToString() ?? "",
-                                HRelationQty = oSub.SelectToken("JOINQTY")?.ToString() ?? "0",
-                                HBackRelationQty = oSub.SelectToken("STOCKRETQTY")?.ToString() ?? "0",
-                                HPropertyID = oSub.SelectToken("AuxPropId_Id")?.ToString() ?? "0",
-                                HBatChNo = oSub.SelectToken("FLot_Text")?.ToString() ?? "",
-                                HAuxPropID = oSub.SelectToken("AuxPropId_Id")?.ToString() ?? "0",
-                                HMTONo = oSub.SelectToken("MtoNo")?.ToString() ?? "",
-                                HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
-                                HERPEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
-                                HSEQ = oSub.SelectToken("Seq")?.ToString() ?? "0",
-                                HRECEIVEDEPTID = oSub.SelectToken("ReceiveDeptId_Id")?.ToString() ?? "0",
-                                HSUPPLIERLOT = oSub.SelectToken("SupplierLot")?.ToString() ?? "",
-                                HBOMID = oSub.SelectToken("BomId_Id")?.ToString() ?? "0",
-                                HBomNumber = oSub.SelectToken("BomId.Number")?.ToString() ?? "",
-                                HSTOCKUNITID = oSub.SelectToken("StockUnitID_Id")?.ToString() ?? "0",
-                                HBASEUNITID = oSub.SelectToken("BaseUnitId_Id")?.ToString() ?? "0",
-                                HBFLOWID = oSub.SelectToken("FBFLowId_Id")?.ToString() ?? "",
-                                HGIVEAWAY = oSub.SelectToken("GiveAway")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
-                                HROWTYPE = oSub.SelectToken("RowType")?.ToString() ?? "",
-                                HBASEUNITQTY = oSub.SelectToken("BaseUnitQty")?.ToString() ?? "0",
-                                HSTOCKBASEQTY = oSub.SelectToken("StockBaseQty")?.ToString() ?? "0",
-                                HREQTRACENO = oSub.SelectToken("ReqTraceNo")?.ToString() ?? "",
-                                HMATERIALDESC = oSub.SelectToken("MaterialDesc[0].Value")?.ToString() ?? "",
-                                HRECEIVEORGID = oSub.SelectToken("ReceiveOrgId_Id")?.ToString() ?? "0",
-                                HREQUIREORGID = oSub.SelectToken("RequireOrgId_Id")?.ToString() ?? "0",
-                                HTAXNETPRICE = oSub.SelectToken("TaxNetPrice")?.ToString() ?? "0",
-                                HPRICECOEFFICIENT = oSub.SelectToken("PriceCoefficient")?.ToString() ?? "0",
-                                HTAXCOMBINATION = oSub.SelectToken("FTaxCombination_Id")?.ToString() ?? "0",
-                                HTAXCOMBINATIONNumber = oSub.SelectToken("FTaxCombination.Number")?.ToString() ?? "",
-                                HPRICEUNITID = oSub.SelectToken("PriceUnitId_Id")?.ToString() ?? "0",
-                                HPRICELISTENTRY = oSub.SelectToken("PriceListEntry_Id")?.ToString() ?? "0",
-                                HPRICELISTENTRYNumber = oSub.SelectToken("PriceListEntry.Number")?.ToString() ?? "",
-                                HPAYORGID = oSub.SelectToken("PayOrgId_Id")?.ToString() ?? "0",
-                                HSETTLEORGID = oSub.SelectToken("SettleOrgId_Id")?.ToString() ?? "0",
-                                HTaxRate_TAX = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRate")?.ToString() ?? "0",
-                                HTaxMoney_TAX = oSub.SelectToken("POORDERENTRY_TAX[0].TaxAmount")?.ToString() ?? "0",
-                                HTAXRATEID = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRateId_Id")?.ToString() ?? "0",
-                                HTAXRATENumber = oSub.SelectToken("POORDERENTRY_TAX[0].TaxRateId.Number")?.ToString() ?? "",
-                                HCOSTPERCENT = oSub.SelectToken("POORDERENTRY_TAX[0].CostPercent")?.ToString() ?? "0",
-                                HCOSTAMOUNT = oSub.SelectToken("POORDERENTRY_TAX[0].CostAmount")?.ToString() ?? "0",
-                                HVAT = oSub.SelectToken("POORDERENTRY_TAX[0].VAT")?.ToString() ?? "",
-                                HSELLERWITHHOLDING = oSub.SelectToken("POORDERENTRY_TAX[0].SellerWithholding")?.ToString() ?? "",
-                                HBUYERWITHHOLDING = oSub.SelectToken("POORDERENTRY_TAX[0].BuyerWithholding")?.ToString() ?? "",
-                            };
-                          
-                        }
+                        hasMore = false; // 濡傛灉鏈杩斿洖鐨勬暟閲忓皯浜庤姹傜殑 limit锛岃鏄庡凡缁忔槸鏈�鍚庝竴椤典簡
                     }
+                    else
+                    {
+                        startRow += limit; // 鍚﹀垯锛屽鍔犺捣濮嬭绱㈠紩锛屽噯澶囪姹備笅涓�椤�
+                    }                    
 
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鎴愬姛";
-                    objJsonResult.data = WebSoBar;
-                    return objJsonResult;
-                }                
+                    foreach (JObject item in formattedData)
+                    {
+                        //鍒犻櫎鍘熸湁璁板綍
+                        oCn.RunProc($"delete from Gy_Material where HItemID = {item["FMATERIALID"]?.ToString()}");
+
+                        oCn.RunProc("set identity_insert Gy_Material on");
+
+                        //閲嶆柊鍐欏叆琛�
+                        oCn.RunProc($"insert into Gy_Material(HItemID,HERPItemID,HNumber,HName,HModel,HShortNumber,HParentID" +
+                        $", HLevel, HEndFlag, HStopflag, HRemark, HMaterClsID, HUnitID, HUnitGroupID" +
+                        $", HLength, HWidth, HHeight, HJQty, HMQty, HOldMaterNumber, HBarCodeType" +
+                        $", HWHID, HSPID, HPlanMode, HUseFlag, HMinPickQty" +
+                        $", HMakeEmp, HMakeTime, HCheckEmp, HCheckTime, HUpdateTime" +
+                        $", HCREATEORGID, HUSEORGID, HBatchManager, HCHECKINCOMING" +
+                        $", HAuxPropFlag, HISKFPERIOD, HEXPUNIT, HEXPPERIOD" +
+                        $", HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID, HSALEPRICEUNITID" +
+                        $", HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID" +
+                        $", HMaxPOQty, HMinPOQty, HMaterTypeID) " +
+                        $" values ( {item["FMATERIALID"]?.ToString()},{item["FMATERIALID"]?.ToString()},'{item["FNumber"]?.ToString()}','{item["FName"]?.ToString()}','{item["FSpecification"]?.ToString()}'" +
+                        $",'{item["FNumber"]?.ToString()}',0,1,1,'{(item["FFORBIDSTATUS"]?.ToString() == "A" ? 0 : 1)}','WEBAPI-瀵煎叆'" +
+                        $",'{item["FErpClsID"]?.ToString()}','{item["FSTOREUNITID"]?.ToString()}',0,'{item["FLENGTH"]?.ToString()}','{item["FWIDTH"]?.ToString()}','{item["FHEIGHT"]?.ToString()}'" +
+                        $",'{item["FNETWEIGHT"]?.ToString()}','{item["FGROSSWEIGHT"]?.ToString()}','{item["FOLDNUMBER"]?.ToString()}','','{item["FSTOCKID"]?.ToString()}','{item["FStockPlaceID"]?.ToString()}'" +
+                        $",'{item["FPLANMODE"]?.ToString()}','鏈楠�',0,'{item["FCREATORID"]?.ToString()}',getdate(),'{item["FAPPROVERID"]?.ToString()}'" +
+                        $",'{item["FAPPROVEDATE"]?.ToString()}','{item["FMODIFYDATE"]?.ToString()}','{item["FCREATEORGID"]?.ToString()}','{item["FUSEORGID"]?.ToString()}','{(item["FISBATCHMANAGE"]?.ToString() == "1" ? 1 : 0)}','{(item["FCHECKINCOMING"]?.ToString() == "1" ? 1 : 0)}'" +
+                        $",'{(item["FISENABLE1"]?.ToString() == "1" ? 1 : 0)}','{(item["FISKFPERIOD"]?.ToString() == "1" ? 1 : 0)}','{item["FEXPUNIT"]?.ToString()}','{item["FEXPPERIOD"]?.ToString()}','{item["FAUXUNITID"]?.ToString()}','{item["FSNUNIT"]?.ToString()}'" +
+                        $",'{item["FBASEUNITID"]?.ToString()}','{item["FSALEUNITID"]?.ToString()}','{item["FSALEPRICEUNITID"]?.ToString()}','{item["FPERUNITSTANDHOUR"]?.ToString()}','{item["FSTDLABORPREPARETIME"]?.ToString()}','{item["FSTDMACHINEPREPARETIME"]?.ToString()}'" +
+                        $",'{item["FMASTERID"]?.ToString()}','{item["FMAXPOQTY"]?.ToString()}','{item["FMINPOQTY"]?.ToString()}','{item["FMATERIALGROUP"]?.ToString()}'" +
+                        $")");
+
+                        oCn.RunProc("set identity_insert Gy_Material off");
+                    }
+                }
+
+                oCn.Commit(); //鎻愪氦浜嬪姟
+                                                                        
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鐗╂枡淇℃伅鍚屾鎴愬姛";
+                objJsonResult.data = "";
+                return objJsonResult;
             }
             catch (Exception e)
             {
+                hasMore = false;
+                oCn.RollBack();//鍥炴粴浜嬪姟
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "鍗曟嵁鏌ヨ鐗╂枡淇℃伅鍙戠敓寮傚父锛�" + e.ToString();
@@ -15756,6 +15689,41 @@
 
         #endregion
 
+        #region 灏嗛噾铦跺崟鎹煡璇EBAPI鎺ュ彛杩斿洖鐨勭函鏁扮粍杞崲涓哄甫瀛楁鍚嶇殑瀵硅薄鍒楄〃
+        public static JArray ConvertKingdeeResultToObjects(string rawJson, string fieldKeys)
+        {
+            // <param name="rawJson">API 杩斿洖鐨勫師濮� JSON 瀛楃涓诧紙濡� [[...],[...]]锛�</param>
+            // <param name="fieldKeys">鏌ヨ鏃朵紶鍏ョ殑 FieldKeys 瀛楃涓诧紙閫楀彿鍒嗛殧锛�</param>
+
+            // 1. 瑙ｆ瀽鍘熷鏁版嵁涓� JArray锛堜簩缁存暟缁勶級
+            JArray rawData = JArray.Parse(rawJson);
+
+            // 2. 鎷嗗垎瀛楁鍚嶆暟缁�
+            string[] fieldNames = fieldKeys.Split(',')
+                                           .Select(f => f.Trim())
+                                           .ToArray();
+
+            // 3. 鍒涘缓缁撴灉鏁扮粍
+            JArray result = new JArray();
+
+            // 4. 閬嶅巻姣忎竴琛屾暟鎹�
+            foreach (JArray row in rawData)
+            {
+                JObject obj = new JObject();
+
+                // 5. 鎸夌储寮曚綅缃槧灏勫瓧娈靛悕鍜屽��
+                for (int i = 0; i < fieldNames.Length && i < row.Count; i++)
+                {
+                    obj[fieldNames[i]] = row[i];
+                }
+
+                result.Add(obj);
+            }
+
+            return result;
+        }
+        #endregion
+
         #endregion
     }
 }
diff --git a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
index d85daf8..30fc56f 100644
--- a/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
-    <History>True|2026-04-21T11:59:04.4142925Z;False|2026-04-21T19:58:56.0531602+08:00;True|2026-04-20T16:04:39.0536757+08:00;True|2026-04-16T11:30:27.4548617+08:00;True|2026-04-16T11:28:16.2273318+08:00;True|2026-04-15T14:26:05.9192637+08:00;False|2026-04-15T14:25:55.1433729+08:00;True|2026-04-15T10:09:40.2224711+08:00;True|2026-04-15T10:01:41.2211939+08:00;False|2026-04-15T10:01:33.5163195+08:00;True|2026-04-10T14:40:32.9638263+08:00;True|2026-04-10T14:09:17.8938591+08:00;True|2026-04-10T09:43:03.1496594+08:00;False|2026-04-10T09:42:48.1357703+08:00;True|2026-04-04T14:02:29.0801567+08:00;False|2026-04-04T14:02:19.7271116+08:00;True|2026-04-02T15:43:33.7777154+08:00;False|2026-04-02T15:43:18.7956363+08:00;True|2026-03-27T14:21:25.0796115+08:00;True|2026-03-26T11:06:46.4787179+08:00;False|2026-03-26T11:06:35.4166660+08:00;True|2026-03-25T16:10:29.4610079+08:00;False|2026-03-25T16:10:15.2610463+08:00;True|2026-03-25T16:05:31.2437927+08:00;False|2026-03-25T16:04:42.8165129+08:00;True|2026-03-25T15:51:12.3488143+08:00;True|2026-03-25T15:41:15.4809614+08:00;True|2026-03-25T15:36:47.6377104+08:00;True|2026-03-25T15:24:05.9533971+08:00;True|2026-03-25T15:08:09.4213443+08:00;True|2026-03-25T15:02:35.5966546+08:00;True|2026-03-25T14:39:57.1426058+08:00;True|2026-03-23T22:27:05.9947039+08:00;True|2026-03-23T22:17:02.8820923+08:00;True|2026-03-23T21:52:15.7333002+08:00;True|2026-03-23T21:47:32.5007616+08:00;True|2026-03-23T21:40:56.5048061+08:00;True|2026-03-23T13:19:40.2829571+08:00;True|2026-03-23T12:21:19.4345768+08:00;True|2026-03-23T12:18:14.1029044+08:00;True|2026-03-23T12:14:30.8931394+08:00;True|2026-03-23T11:21:56.8156303+08:00;True|2026-03-23T11:12:41.0316561+08:00;True|2026-03-23T11:08:54.1270716+08:00;True|2026-03-23T09:56:08.8942090+08:00;True|2026-03-20T10:11:11.2023901+08:00;True|2026-03-17T09:33:58.4998522+08:00;True|2026-03-13T14:39:56.2046419+08:00;True|2026-03-13T10:45:44.5969827+08:00;False|2026-03-13T10:45:39.0031185+08:00;True|2026-03-13T10:33:50.6454960+08:00;True|2026-03-13T10:13:54.8054151+08:00;False|2026-03-13T10:13:48.7433858+08:00;True|2026-03-13T08:27:44.0365848+08:00;False|2026-03-13T08:27:15.7236925+08:00;True|2026-03-10T13:21:23.4020454+08:00;False|2026-03-10T13:20:37.7978257+08:00;True|2026-03-09T16:23:37.1957075+08:00;False|2026-03-09T16:23:09.1793900+08:00;True|2026-03-08T19:14:49.7700862+08:00;False|2026-03-08T19:13:57.9637951+08:00;True|2026-03-07T15:31:56.3119377+08:00;True|2026-03-07T15:27:26.3686205+08:00;True|2026-03-07T15:20:44.8497962+08:00;True|2026-03-07T15:16:09.1126972+08:00;True|2026-03-07T15:13:14.8502726+08:00;True|2026-03-07T15:00:35.5106409+08:00;True|2026-03-06T09:17:38.4826562+08:00;False|2026-03-06T09:17:12.2137124+08:00;True|2026-03-04T10:37:38.3542826+08:00;True|2026-03-04T10:35:38.0033181+08:00;False|2026-03-04T10:35:21.6139985+08:00;True|2026-03-04T10:10:33.7184690+08:00;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
+    <History>True|2026-04-29T08:00:17.6440714Z;True|2026-04-29T14:14:09.1651505+08:00;False|2026-04-29T14:13:54.1872312+08:00;True|2026-04-24T15:49:18.5984317+08:00;True|2026-04-24T15:18:37.7596765+08:00;False|2026-04-24T15:18:27.3527276+08:00;True|2026-04-24T14:34:40.4556991+08:00;True|2026-04-23T15:33:33.6935128+08:00;True|2026-04-23T13:07:44.0967026+08:00;True|2026-04-23T11:44:04.1791314+08:00;True|2026-04-23T11:37:21.5525136+08:00;False|2026-04-23T11:37:11.8652401+08:00;True|2026-04-21T19:59:04.4142925+08:00;False|2026-04-21T19:58:56.0531602+08:00;True|2026-04-20T16:04:39.0536757+08:00;True|2026-04-16T11:30:27.4548617+08:00;True|2026-04-16T11:28:16.2273318+08:00;True|2026-04-15T14:26:05.9192637+08:00;False|2026-04-15T14:25:55.1433729+08:00;True|2026-04-15T10:09:40.2224711+08:00;True|2026-04-15T10:01:41.2211939+08:00;False|2026-04-15T10:01:33.5163195+08:00;True|2026-04-10T14:40:32.9638263+08:00;True|2026-04-10T14:09:17.8938591+08:00;True|2026-04-10T09:43:03.1496594+08:00;False|2026-04-10T09:42:48.1357703+08:00;True|2026-04-04T14:02:29.0801567+08:00;False|2026-04-04T14:02:19.7271116+08:00;True|2026-04-02T15:43:33.7777154+08:00;False|2026-04-02T15:43:18.7956363+08:00;True|2026-03-27T14:21:25.0796115+08:00;True|2026-03-26T11:06:46.4787179+08:00;False|2026-03-26T11:06:35.4166660+08:00;True|2026-03-25T16:10:29.4610079+08:00;False|2026-03-25T16:10:15.2610463+08:00;True|2026-03-25T16:05:31.2437927+08:00;False|2026-03-25T16:04:42.8165129+08:00;True|2026-03-25T15:51:12.3488143+08:00;True|2026-03-25T15:41:15.4809614+08:00;True|2026-03-25T15:36:47.6377104+08:00;True|2026-03-25T15:24:05.9533971+08:00;True|2026-03-25T15:08:09.4213443+08:00;True|2026-03-25T15:02:35.5966546+08:00;True|2026-03-25T14:39:57.1426058+08:00;True|2026-03-23T22:27:05.9947039+08:00;True|2026-03-23T22:17:02.8820923+08:00;True|2026-03-23T21:52:15.7333002+08:00;True|2026-03-23T21:47:32.5007616+08:00;True|2026-03-23T21:40:56.5048061+08:00;True|2026-03-23T13:19:40.2829571+08:00;True|2026-03-23T12:21:19.4345768+08:00;True|2026-03-23T12:18:14.1029044+08:00;True|2026-03-23T12:14:30.8931394+08:00;True|2026-03-23T11:21:56.8156303+08:00;True|2026-03-23T11:12:41.0316561+08:00;True|2026-03-23T11:08:54.1270716+08:00;True|2026-03-23T09:56:08.8942090+08:00;True|2026-03-20T10:11:11.2023901+08:00;True|2026-03-17T09:33:58.4998522+08:00;True|2026-03-13T14:39:56.2046419+08:00;True|2026-03-13T10:45:44.5969827+08:00;False|2026-03-13T10:45:39.0031185+08:00;True|2026-03-13T10:33:50.6454960+08:00;True|2026-03-13T10:13:54.8054151+08:00;False|2026-03-13T10:13:48.7433858+08:00;True|2026-03-13T08:27:44.0365848+08:00;False|2026-03-13T08:27:15.7236925+08:00;True|2026-03-10T13:21:23.4020454+08:00;False|2026-03-10T13:20:37.7978257+08:00;True|2026-03-09T16:23:37.1957075+08:00;False|2026-03-09T16:23:09.1793900+08:00;True|2026-03-08T19:14:49.7700862+08:00;False|2026-03-08T19:13:57.9637951+08:00;True|2026-03-07T15:31:56.3119377+08:00;True|2026-03-07T15:27:26.3686205+08:00;True|2026-03-07T15:20:44.8497962+08:00;True|2026-03-07T15:16:09.1126972+08:00;True|2026-03-07T15:13:14.8502726+08:00;True|2026-03-07T15:00:35.5106409+08:00;True|2026-03-06T09:17:38.4826562+08:00;False|2026-03-06T09:17:12.2137124+08:00;True|2026-03-04T10:37:38.3542826+08:00;True|2026-03-04T10:35:38.0033181+08:00;False|2026-03-04T10:35:21.6139985+08:00;True|2026-03-04T10:10:33.7184690+08:00;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
@@ -45,28 +45,28 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>04/21/2026 19:58:24</publishTime>
+      <publishTime>04/29/2026 15:59:50</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>04/21/2026 19:58:24</publishTime>
+      <publishTime>04/29/2026 15:59:50</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>04/21/2026 19:58:22</publishTime>
+      <publishTime>04/29/2026 15:59:44</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>04/21/2026 19:58:22</publishTime>
+      <publishTime>04/29/2026 15:59:44</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>04/21/2026 19:58:19</publishTime>
+      <publishTime>04/29/2026 15:59:38</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>04/21/2026 19:58:19</publishTime>
+      <publishTime>04/29/2026 15:59:38</publishTime>
     </File>
     <File Include="bin/Fleck.dll">
       <publishTime>04/22/2021 11:48:12</publishTime>
@@ -150,10 +150,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>04/21/2026 19:58:20</publishTime>
+      <publishTime>04/29/2026 15:59:41</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>04/21/2026 19:58:20</publishTime>
+      <publishTime>04/29/2026 15:59:41</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>08/18/2025 16:11:18</publishTime>
@@ -189,34 +189,34 @@
       <publishTime>11/13/2012 20:19:34</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>04/21/2026 19:58:16</publishTime>
+      <publishTime>04/29/2026 15:59:33</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>04/21/2026 19:58:16</publishTime>
+      <publishTime>04/29/2026 15:59:33</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:36</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:36</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:36</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:36</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
     </File>
     <File Include="bin/SyntacticSugar.dll">
-      <publishTime>04/10/2026 09:35:18</publishTime>
+      <publishTime>04/24/2026 16:24:01</publishTime>
     </File>
     <File Include="bin/SyntacticSugar.pdb">
-      <publishTime>04/10/2026 09:35:18</publishTime>
+      <publishTime>04/24/2026 16:24:01</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
       <publishTime>07/19/2017 18:01:28</publishTime>
@@ -330,19 +330,19 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:35</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>04/21/2026 19:58:18</publishTime>
+      <publishTime>04/29/2026 15:59:35</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>04/21/2026 19:58:29</publishTime>
+      <publishTime>04/29/2026 16:00:01</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>04/21/2026 19:58:29</publishTime>
+      <publishTime>04/29/2026 16:00:01</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
@@ -567,7 +567,7 @@
       <publishTime>10/27/2025 08:51:29</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/21/2026 19:59:01</publishTime>
+      <publishTime>04/29/2026 16:00:15</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 677b09f..24309d2 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -47,6 +47,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Alex.Kingdee.Cloud.WebAPI.Client, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Alex.Kingdee.Cloud.WebAPI.Client.2.5.0\lib\net45\Alex.Kingdee.Cloud.WebAPI.Client.dll</HintPath>
+    </Reference>
     <Reference Include="AlibabaCloud.EndpointUtil, Version=0.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\AlibabaCloud.EndpointUtil.0.1.1\lib\net45\AlibabaCloud.EndpointUtil.dll</HintPath>
     </Reference>
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index 1cdeeca..00bc5db 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -1,5 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Alex.Kingdee.Cloud.WebAPI.Client" version="2.5.0" targetFramework="net45" />
   <package id="AlibabaCloud.EndpointUtil" version="0.1.1" targetFramework="net45" />
   <package id="AlibabaCloud.GatewayDingTalk" version="1.0.2" targetFramework="net45" />
   <package id="AlibabaCloud.GatewaySpi" version="0.0.3" targetFramework="net45" />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 277ac98..542f577 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 94912a4..39aa1dc 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
new file mode 100644
index 0000000..22327be
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a42c21b
--- /dev/null
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index ca71e7b..35e5324 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.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 277ac98..542f577 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 94912a4..39aa1dc 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
new file mode 100644
index 0000000..afa8882
--- /dev/null
+++ 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
new file mode 100644
index 0000000..0312216
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..22327be
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a42c21b
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1