From 44022bb67f0274c444dce7bc558e7a16df93b402 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 17:43:07 +0800
Subject: [PATCH] 1

---
 WebAPI/WebAPI.csproj.user                                             |    4 
 DAL/应付管理/ClsYF_PayMentBill.cs                                         |   59 ++
 DBUtility/bin/Release/Pub_Class.dll                                   |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache   |    0 
 WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs          |    8 
 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml               |   16 
 Model/bin/Release/Pub_Control.pdb                                     |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb                            |    0 
 Model/bin/Release/Pub_Class.pdb                                       |    0 
 WebAPI/Models/ClsGy_Material_Model.cs                                 |    2 
 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml               |   16 
 PayM/obj/Debug/Interop.gregn6Lib.dll                                  |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.dll                            |    0 
 sdk_dingding/TopSdk/bin/Release/TopSdk.dll                            |    0 
 Model/obj/Release/Model.pdb                                           |    0 
 BLL/bin/Release/BLL.pdb                                               |    0 
 Model/bin/Release/Pub_Control.dll                                     |    0 
 Pub_Control/bin/Release/Pub_Class.pdb                                 |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user         |  258 ++++++------
 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb                            |    0 
 Pub_Control/bin/Release/Pub_Class.dll                                 |    0 
 BLL/bin/Release/Pub_Control.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 
 BLL/bin/Release/Pub_Control.dll                                       |    0 
 DAL/bin/Release/SQLHelper.pdb                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache         |    0 
 PayM/obj/Debug/PayM.csproj.ResolveComReference.cache                  |    0 
 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs           |   43 +
 SQLHelper/bin/Release/SQLHelper.pdb                                   |    0 
 DBUtility/obj/Release/DBUtility.pdb                                   |    0 
 Model/bin/Release/DBUtility.dll                                       |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml              |    8 
 BLL/bin/Release/DBUtility.dll                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache      |    0 
 WebAPI/Web.config                                                     |    4 
 BLL/bin/Release/BLL.dll                                               |    0 
 Pub_Control/bin/Release/Pub_Control.pdb                               |    0 
 DBUtility/obj/Release/DBUtility.dll                                   |    0 
 Model/obj/Release/Model.dll                                           |    0 
 BLL/bin/Release/Pub_Class.dll                                         |    0 
 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs          |    2 
 DBUtility/bin/Release/SQLHelper.dll                                   |    0 
 Model/obj/Release/Model.csproj.AssemblyReference.cache                |    0 
 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs                   |  104 +++++
 DBUtility/bin/Release/SQLHelper.pdb                                   |    0 
 Model/bin/Release/Pub_Class.dll                                       |    0 
 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs                   |    8 
 BLL/bin/Release/Pub_Class.pdb                                         |    0 
 DAL/质检管理/ClsQC_FirstPieceCheckBill.cs                                 |    4 
 NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll                           |    0 
 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 
 WebAPI/Controllers/BLL/Xt_BillTypeController.cs                       |   50 +
 BLL/bin/Release/SQLHelper.dll                                         |    0 
 DAL/bin/Release/DBUtility.pdb                                         |    0 
 DAL/bin/Release/Model.dll                                             |    0 
 DBUtility/bin/Release/Pub_Control.dll                                 |    0 
 Model/bin/Release/SQLHelper.pdb                                       |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user          |    6 
 DAL/bin/Release/Pub_Control.pdb                                       |    0 
 DAL/bin/Release/DAL.pdb                                               |    0 
 SQLHelper/obj/Release/SQLHelper.dll                                   |    0 
 DAL/应收管理/ClsYS_ReceiveBill.cs                                         |    4 
 BLL/bin/Release/Model.dll                                             |    0 
 BLL/bin/Release/DAL.pdb                                               |    0 
 BLL/bin/Release/Model.pdb                                             |    0 
 DAL/bin/Release/DAL.dll                                               |    0 
 DAL/bin/Release/Model.pdb                                             |    0 
 SQLHelper/obj/Release/SQLHelper.pdb                                   |    0 
 DBUtility/bin/Release/DBUtility.pdb                                   |    0 
 DBUtility/bin/Release/DBUtility.dll                                   |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache |    0 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache        |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user         |   18 
 WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs           |  212 +++++++++--
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt      |   25 +
 WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs        |    2 
 WebAPI/Controllers/GG_NoticeController.cs                             |   46 ++
 WebAPI/Models/ClsKf_ICStockBillSub.cs                                 |    2 
 Pub_Class/bin/Release/Pub_Class.pdb                                   |    0 
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user        |   40 +-
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs                   |   84 ++++
 SQLHelper/bin/Release/Pub_Class.pdb                                   |    0 
 Pub_Class/bin/Release/Pub_Class.dll                                   |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache        |    0 
 SQLHelper/bin/Release/Pub_Class.dll                                   |    0 
 DAL/bin/Release/Pub_Class.pdb                                         |    0 
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml             |    4 
 NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache    |    0 
 DAL/质检管理/ClsQC_PatrolProcCheckOtherBill.cs                            |    2 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt    |    6 
 Model/bin/Release/Model.pdb                                           |    0 
 DAL/bin/Release/Pub_Class.dll                                         |    0 
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs                 |   56 +-
 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user          |    6 
 Model/bin/Release/Model.dll                                           |    0 
 DBUtility/bin/Release/Pub_Class.pdb                                   |    0 
 Model/bin/Release/SQLHelper.dll                                       |    0 
 105 files changed, 815 insertions(+), 284 deletions(-)

diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 7b02f6f..2306d28 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 0b7a3f5..8bd8c26 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 cf0aae9..04d91fd 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 cd548a7..245c15e 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 15c73e2..e2f3d13 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 162529f..2e70ba7 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index b355155..9d99395 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index e9dbdff..d34c26f 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index ea2daf3..7627107 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 008112a..1594144 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 31b5edf..cd19676 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 cf0aae9..04d91fd 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 cd548a7..245c15e 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 15c73e2..e2f3d13 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 162529f..2e70ba7 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index b355155..9d99395 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index e9dbdff..d34c26f 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index ea2daf3..7627107 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index 008112a..1594144 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 31b5edf..cd19676 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs" "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
index 39ea7a2..c13f622 100644
--- "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
+++ "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
@@ -31,8 +31,48 @@
         {
             DetailColl = null;
         }
-       
+
         #endregion   鑷畾涔夋柟娉�
+
+        //鍒犻櫎鍏宠仈
+        public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+        {
+            //搴旀敹鍗� 鍏宠仈鏁伴噺
+            try
+            {
+                if (DetailColl[0].HSourceBillType == "1114")                    //搴斾粯鍗�
+                {
+                    oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + lngBillKey.ToString());
+                }
+                else
+                {
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
+        //鏂板鍏宠仈
+        public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+        {
+            //搴旀敹鍗� 鍏宠仈鏁伴噺
+            try
+            {
+                if (DetailColl[0].HSourceBillType == "1114")                    //搴斾粯鍗�
+                {
+                    oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Add " + lngBillKey.ToString());
+                }
+                else
+                {
+
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
         //淇敼鍗曟嵁
         public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
         {
@@ -82,8 +122,11 @@
                 ",HMainSourceBillNo='" + omodel.HMainSourceBillNo.ToString() +
                 "',HMainSourceBillType='" + omodel.HMainSourceBillType.ToString() +
                 "' where HInterID=" + lngBillKey.ToString());
-                //鍒犻櫎鍏宠仈
-                DeleteRelation(ref sReturn, lngBillKey);
+                if (DetailColl.Count != 0)
+                {
+                    //鍒犻櫎鍏宠仈
+                    DeleteRelation(ref sReturn, lngBillKey);
+                }
                 //鍒犻櫎瀛愯〃
                 DeleteBillSub(lngBillKey);
                 //鎻掑叆瀛愯〃
@@ -120,6 +163,11 @@
                 //        return false;
                 //    }
                 //}
+                if (DetailColl.Count != 0)
+                {
+                    //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+                    AddNewRelation(ref sReturn, omodel.HInterID);
+                }
                 sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
                 oCn.Commit();
                 return true;
@@ -178,6 +226,11 @@
                       "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                       ") ");
                 }
+                if (DetailColl.Count != 0)
+                {
+                    //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+                    AddNewRelation(ref sReturn, omodel.HInterID);
+                }
                 //
                 //foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
                 //{
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
index 2f34b78..8c0ee97 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
@@ -41,7 +41,7 @@
             //搴旀敹鍗� 鍏宠仈鏁伴噺
             try
             {
-                if (DetailColl[0].HSourceBillType == "1114")                    //搴旀敹鍗�
+                if (DetailColl[0].HSourceBillType == "1426")                    //搴旀敹鍗�
                 {
                     oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Del " + lngBillKey.ToString());
                 }
@@ -60,7 +60,7 @@
             //搴旀敹鍗� 鍏宠仈鏁伴噺
             try
             {
-                if (DetailColl[0].HSourceBillType == "1114")                    //搴旀敹鍗�
+                if (DetailColl[0].HSourceBillType == "1426")                    //搴旀敹鍗�
                 {
                     oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Add " + lngBillKey.ToString());
                 }
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 1055eb1..c4a96db 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"
@@ -109,13 +109,13 @@
                       ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
                       ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                       ",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
-                      ",HMax,HMin,HAvg" +
+                      ",HMax,HMin,HAvg,HInspectVal" +
                       ") values("
                       + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                       ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                       "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                       "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult +"'"+
-                      ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" +
+                      ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','"+ oSub.HInspectVal + "'" +
                       ") ");
                 }
                 //foreach (Model.ClsQC_FirstPieceCheckBillSub_Item oSub2 in DetailColl1)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
index 4dae845..00882d0 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckOtherBill.cs"
@@ -151,7 +151,7 @@
                       ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty + 
                       "," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
                       "'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
-                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
+                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + Convert.ToString(oSub.HKeyInspect ? 1 : 0)+ ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                 }
               
                 sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 15c73e2..e2f3d13 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 162529f..2e70ba7 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index ea2daf3..7627107 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index 008112a..1594144 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 31b5edf..cd19676 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index ca9c598..65345fe 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 02d48ba..ea6d1a1 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index d2cdf67..57d78b9 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 15c73e2..e2f3d13 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 162529f..2e70ba7 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 15c73e2..e2f3d13 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 162529f..2e70ba7 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index b355155..9d99395 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index e9dbdff..d34c26f 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index ea2daf3..7627107 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index 008112a..1594144 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 31b5edf..cd19676 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 14c2b27..cfd2794 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index b355155..9d99395 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index e9dbdff..d34c26f 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
index e301fe5..35a5e0b 100644
--- a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 59a09a6..df5e8a8 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/Debug/Interop.gregn6Lib.dll b/PayM/obj/Debug/Interop.gregn6Lib.dll
index 7726c87..8bd7e5b 100644
--- a/PayM/obj/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
index 59a09a6..df5e8a8 100644
--- a/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index ea2daf3..7627107 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index 008112a..1594144 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 1f090a7..6c3c851 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 0fd9cc0..85f204f 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 31b5edf..cd19676 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 2f2af22..79ab06b 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 67b496f..8d80856 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 31b5edf..cd19676 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
index 7ebf34f..b9eeacb 100644
--- a/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
+++ b/WebAPI/Controllers/BLL/Xt_BillTypeController.cs
@@ -13,11 +13,9 @@
     public class Xt_BillTypeController : ApiController
     {
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
-
 
         /// <summary>
         /// 杩斿洖鍗曟嵁绫诲瀷鍒楄〃
@@ -77,7 +75,6 @@
                 return objJsonResult;
             }
         }
-
 
         /// <summary>
         /// 鍗曟嵁绫诲瀷鍒楄〃淇敼鏂规硶
@@ -146,7 +143,6 @@
         [HttpPost]
         public object AddBill1([FromBody] JObject oMain)
         {
-
             try
             {
                 var _value = oMain["oMain"].ToString();
@@ -169,8 +165,6 @@
                 string HViewName = list[0].HViewName;
                 string HRightName = list[0].HRightName;
 
-
-               
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
                 //涓昏〃
@@ -204,7 +198,6 @@
             }
         }
 
-
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -220,11 +213,7 @@
                 string msg1 = _value.ToString();
                 //鍙嶅簭鍒楀寲
                 msg1 = "[" + msg1.ToString() + "]";
-
-
-
                 List<BillType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BillType>>(msg1);
-
                 long HItemID = list[0].HItemID;
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
@@ -234,13 +223,9 @@
                 string HViewName = list[0].HViewName;
                 string HRightName = list[0].HRightName;
 
-
-
-
-
-
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
+
                 //涓昏〃
                 oCN.RunProc("Insert Into Xt_BillType " +
                 "(HNumber,HName,HTemplate,HHeadTable" +
@@ -268,6 +253,39 @@
             }
         }
 
+        
+        /// <summary>
+        /// 鍗曟嵁鍒犻櫎
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("YS_ReceiveBill/delete_Test1")]
+        [HttpGet]
+        public object deleteYS_ReceiveBill(long HItemID)
+        {
+            try
+            {
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCN.BeginTran();
+                //涓昏〃
+                oCN.RunProc("delete from Xt_BillType Where HItemID =" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+                //objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
         #region 鍗曟嵁绫诲瀷 閲戣澏鍚屾
         [Route("Xt_BillType/SaveXt_BillTypeListApi")]
         [HttpPost]
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 7102970..5d82ab6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -22,7 +22,7 @@
         //鑾峰彇绯荤粺鍙傛暟
         Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
+        public string sWhere = "";
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
@@ -237,7 +237,7 @@
         #region 鑾峰彇椤圭洰鍙�
         [Route("Gy_Material/Get_HProject")]
         [HttpGet]
-        public object Get_HProject(string HOrgID)
+        public object Get_HProject()
         {
             try
             {
@@ -261,6 +261,86 @@
         }
         #endregion
 
+        /// <summary>
+        /// 鑾峰彇椤圭洰鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Gy_Material/GetProjectGroupList_Json")]
+        [HttpGet]
+        public object GetProjectGroupList_Json(string Unit)
+            { 
+                if (Unit != "" && Unit != null)
+                {
+                    sWhere = sWhere + " and ( HBillNo like '%" + Unit + "%' or HProName like '%" + Unit + "%' ) ";
+                }
+
+                try
+                {
+                    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                    if (sWhere == null || sWhere.Equals(""))
+                    {
+                        ds = oCN.RunProcReturn("Select HInterID,HBillNo 椤圭洰浠ｇ爜,HProName 椤圭洰缁� from PM_ProjectBillMain where HCloseType = 0 Order by HInterID ", "PM_ProjectBillMain");
+                    }
+                    else
+                    {
+                        string sql1 = "Select HInterID,HBillNo 椤圭洰浠ｇ爜,HProName 椤圭洰缁� from PM_ProjectBillMain where HCloseType = 0 ";
+                        string sql = sql1 + sWhere;
+                        ds = oCN.RunProcReturn(sql, "PM_ProjectBillMain");
+                    }
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鑾峰彇鎴愬姛!";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #region 鑾峰彇浜嬩笟閮�
+        [Route("Gy_Material/Get_Gy_Division")]
+        [HttpGet]
+        public object Get_Gy_Division(string HOrgID)
+        {
+            try
+            {
+                DataSet oDs = new DataSet();
+                //==========
+                oDs = oCN.RunProcReturn("	select HItemID,HName from Gy_Division", "Gy_Division");
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇鎴愬姛锛�";
+                objJsonResult.data = oDs.Tables[0];
+                return objJsonResult; ;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
 
         /// <summary>
         /// 鐗╂枡璁剧疆鑾峰彇淇℃伅
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 1b4ba59..83e42dc 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -35,7 +35,7 @@
                 {
                     ds = oCN.RunProcReturn("select * from  Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");
 
-                    if (ds.Tables[0].Rows.Count == 0) {
+                    if (ds.Tables[0].Rows.Count != 0) {
                         objJsonResult.code = "1";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "Sucess锛�";
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index a797923..08f77ae 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -2953,6 +2953,110 @@
             }
         }
         #endregion
+
+        #region 閲囪喘璁㈠崟鏌ヨ鍒楄〃
+        [Route("Cg_POOrderBill/QueryList")]
+        [HttpGet]
+        public object QueryList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                string sql = "select * from h_v_Cg_POOrderBillQuery where 1 = 1 ";
+
+                if (sWhere == "" || sWhere == null)
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_Cg_POOrderBillQuery  order by hmainid desc", "h_v_Cg_POOrderBillQuery");
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Cg_POOrderBillQuery");
+                }
+
+
+
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 閲囪喘璁㈠崟鏌ヨ瀛愬垪琛�
+        [Route("Cg_POOrderBill/QuerySubList")]
+        [HttpGet]
+        public object QuerySubList(string hmainid, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid =  "+ hmainid;
+
+                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
+                
+
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 03729bf..9267506 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -447,7 +447,13 @@
 
                 string sReturn = "";
                 oCN.BeginTran();
-
+                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
+                string hSourceBillType = ds.Tables[0].Rows[0]["婧愬崟绫诲瀷"].ToString();
+                if (hSourceBillType == "1114")
+                {
+                    //鏀舵鍗� 鍒犻櫎鍥炲～ 搴斾粯鍗曞叧鑱旀暟閲�
+                    oCN.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + HInterID);
+                }
                 oCN.RunProc("delete from YF_PayMentBillMain where HInterID = " + HInterID);
                 oCN.RunProc("delete from YF_PayMentBillSub where HInterID= " + HInterID);
 
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 51bba58..e1ab339 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -344,34 +344,34 @@
                     return objJsonResult;
                 }
 
-                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
-                if (ds == null)
-                {
-                    oCN.RollBack();
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                if (ds.Tables[0].Rows.Count == 0)
-                {
-                    oCN.RollBack();
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
-                {
-                    oCN.RollBack();
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+                //if (ds == null)
+                //{
+                //    oCN.RollBack();
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                //if (ds.Tables[0].Rows.Count == 0)
+                //{
+                //    oCN.RollBack();
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+                //{
+                //    oCN.RollBack();
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
                 oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
                 //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
                 ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +
diff --git a/WebAPI/Controllers/GG_NoticeController.cs b/WebAPI/Controllers/GG_NoticeController.cs
index 6d253d8..0753af0 100644
--- a/WebAPI/Controllers/GG_NoticeController.cs
+++ b/WebAPI/Controllers/GG_NoticeController.cs
@@ -306,5 +306,51 @@
         }
         #endregion
 
+        /// <summary>
+        /// 鏍规嵁鐢ㄦ埛鍚嶈幏鍙栧叕鍛婂垪琛�
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [Route("GG_Notice/notices")]
+        [HttpGet]
+        public object getNotices(string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                var sql = "select top(10) m.HMakeDate as 鏃ユ湡, m.HLevel as 绱ф�ョ▼搴�, m.HContext as 涓婚 " +
+                           " , m.HSendMan as 鍙戦�佷汉, s.HReceiveMan as 鎺ユ敹浜�, d.HName as 鍙戦�侀儴闂� " +
+                           " from OA_InformBillMain as m" +
+                           " inner join OA_InformBillSub as s on m.HInterID = s.HInterID" +
+                           " left join Gy_Department d on m.HDeptID = d.HItemID" +
+                           " where 1 = 1 and" + " s.HReceiveMan =" + "'" + user + "'" +
+                           " order by m.HMakeDate desc";
+
+                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "OA_InformBillMain");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch(Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
     }
 }
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index f525028..0ae4bd1 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -746,7 +746,7 @@
                 {
                     if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl == "Y")
                     {
-                        ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HICMOBillNo = '" + oBill.omodel.HICMOBillNo + "' and HInterID = '" + oBill.omodel.HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
+                        ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HSourceBillNo = '" + oBill.omodel.HProcExchBillNo + "' and HSourceInterID = '" + oBill.omodel.HProcExchInterID + "'and HSourceEntryID = '" + oBill.omodel.HProcExchEntryID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
                         if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
                         {
                             objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 08ca53e..cf91001 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -2925,7 +2925,7 @@
                 {
 
                     bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 1, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
+                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 2, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
                 }
                 else if (refSav == "Update")
                 {
@@ -6653,7 +6653,7 @@
 
             }
 
-            if (HHandleEmpID==0) //寮傚父鍙嶉楠屾敹鍗曚繚瀛�  灏嗘秷鎭� 鍙戦�佺粰 鎺ユ敹浜猴紝鎸囨淳澶勭悊浜猴紝鍏ㄩ儴鎶勯�佷汉 
+            if (HHandleEmpID==0) // 
             {
                 string HReceiveMan = HSendMan;
                 string[] names = HCopyMan.Split(',');
@@ -6674,13 +6674,14 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸查獙鏀�";
             }
-            else if (HHandleEmpID==1)//寮傚父鍙嶉绛惧埌鍗�,寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
+            else if (HHandleEmpID==1)//寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
             {
                 //鑾峰彇鍙戦�佷汉  鎺ユ敹浜�
                 string HReceiveMan = HCopyMan;
                 string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
-                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");               
+                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");                   
                 List<string> HNames = new List<string>();
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
@@ -6689,16 +6690,13 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸茬鍒�";
             }
-            else
+            else if (HHandleEmpID == 2)//寮傚父鍙嶉澶勭悊鍗�  灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
             {
-                //鏌ヨ鎸囨淳澶勭悊浜�
-                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
-                ds = oCN.RunProcReturn(sql, "Gy_Employee");
-                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
-                //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
-                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
-                LogService.CustomWriteLog("10鍙傛暟" + sql1, "寮傚父缃氭");
+                //鑾峰彇鍙戦�佷汉  鎺ユ敹浜�
+                string HReceiveMan = HCopyMan;
+                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
                 ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                 List<string> HNames = new List<string>();
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -6708,7 +6706,26 @@
 
                 }
                 concatenatedNames = string.Join(",", HNames);
-                LogService.CustomWriteLog("9鍙傛暟" + concatenatedNames, "寮傚父缃氭");
+                HDescription = HDescription + "--宸插鐞�";
+            }
+            else
+            {
+                //鏌ヨ鎸囨淳澶勭悊浜�
+                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
+                ds = oCN.RunProcReturn(sql, "Gy_Employee");
+                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
+                //鑾峰彇鎸囨淳澶勭悊浜�,鍙戦�佷汉鐨勯拤閽塱d
+                string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
+                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+                List<string> HNames = new List<string>();
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+                {
+                    string HName = ds.Tables[0].Rows[i]["閽夐拤id"].ToString();
+                    HNames.Add(HName);
+
+                }
+                concatenatedNames = string.Join(",", HNames);
+                HDescription = HDescription + "--宸叉帴鏀�";
             }
           
             //鑾峰彇浼佷笟鐨刟ccess_token鐨勫��
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index bf33427..41b7e8a 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -678,7 +678,7 @@
         }
         #endregion
 
-        #region 璐ㄩ噺妯″潡    璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�
+        #region 璐ㄩ噺妯″潡    璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥� 鏍规嵁娴佽浆鍗¤幏鍙栬澶�+妯″叿
 
         [Route("QC_CustomerAppealReport/Get_EquipList")]
         [HttpGet]
@@ -688,7 +688,10 @@
             {   
                 List<object> columnNameList = new List<object>();
                     
-                ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HName HName  from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain  b on a.HEquipID=b.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
+                ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HEquipFileNumber HEquipFileNumber,b.HName HName,d.HMouldNo HMouldNumber,d.HName HMouldName " +
+                    " from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain  b on a.HEquipID=b.HInterID" +
+                    " left join Sc_ICMOBillStatus_Tmp c on a.HProcExchInterID = c.HSourceInterID and a.HProcExchEntryID = c.HSourceEntryID and a.HProcID = c.HProcID" +
+                    " left join Gy_MouldFileMain d on c.HMouldID = d.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -949,16 +952,19 @@
             try
             {
                 List<object> columnNameList = new List<object>();
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformanceFirstPassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformanceFirstPassList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_QC_ProcessPerformanceFirstPassList where 1 = 1 ";
-                    string sql = sql1 + sWhere + " order by 鏈堜唤 ";
-                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformanceFirstPassList");
-                }
+
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HYear = dic["HYear"].ToString();//骞�
+                string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
+                string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+                string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
+                string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+                string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+                string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList   '" + HYear + "','"+ HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
+              
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -986,7 +992,6 @@
         }
         #endregion
 
-
         #region 璐ㄩ噺妯″潡   鍒剁▼缁╂晥瓒嬪娍鍥�(鍚堟牸鐜�)  鏌ヨ
 
         [Route("QC_CustomerAppealReport/getQC_ProcessPerformancePass")]
@@ -996,16 +1001,19 @@
             try
             {
                 List<object> columnNameList = new List<object>();
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessPerformancePassList order by 鏈堜唤 desc", "h_v_QC_ProcessPerformancePassList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_QC_ProcessPerformancePassList where 1 = 1 ";
-                    string sql = sql1 + sWhere + " order by 鏈堜唤 ";
-                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessPerformancePassList");
-                }
+               
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HYear = dic["HYear"].ToString();//骞�
+                string HDeptName = dic["HDeptName"].ToString();//閮ㄩ棬
+                string HProject = dic["HProject"].ToString();//椤圭洰鍙�
+                string HMaterNumber = dic["HMaterNumber"].ToString();//鐗╂枡浠ｇ爜
+                string HMaterName = dic["HMaterName"].ToString();//鐗╂枡鍚嶇О
+                string HBatchWork = dic["HBatchWork"].ToString();//鏄惁閲忎骇
+                string HDivisionName = dic["HDivisionName"].ToString();//浜嬩笟閮�
+
+                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList  '" + HYear + "','" + HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");
+
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1381,25 +1389,16 @@
             {
                 List<object> columnNameList = new List<object>();
 
-                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
-
-                string HEquipNumber = dic["HEquipNumber"].ToString();
-                string HEquipName = dic["HEquipName"].ToString();
-                string HProcName = dic["HProcName"].ToString();
-
-                string HTechParamName = dic["HTechParamName"].ToString();              
-                string HDate = dic["HDate"].ToString();
-
-                if ((HEquipNumber == null || HEquipNumber == "") && (HEquipName == null || HEquipName == "") && (HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HDate == null || HDate == ""))
+                if (sWhere == null || sWhere.Equals(""))
                 {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
+                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMentCollectionTechParam order by 閲囬泦鏃ユ湡 desc", "h_v_Sb_EquipMentCollectionTechParam");
                 }
-
-                ds = oCN.RunProcReturn("select HSourceCode 璁惧缂栫爜,CONVERT(VARCHAR, HDate, 120) 閲囬泦鏃ユ湡,HTechParamName 宸ヨ壓浜ф暟,HResult 鏁伴噰鍊� from Sb_EquipMentCollectionTechParam_Temp where HSourceCode='" + HEquipNumber + "' and HTechParamName='"+ HTechParamName + "' and CONVERT(date, HDate) <='"+HDate+"'", "Sb_EquipMentCollectionTechParam_Temp");
+                else
+                {
+                    string sql1 = "select * from h_v_Sb_EquipMentCollectionTechParam where 1 = 1 ";
+                    string sql = sql1 + sWhere + " order by 閲囬泦鏃ユ湡 ";
+                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParam");
+                }
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1427,5 +1426,138 @@
         }
         #endregion
 
+        #region 璐ㄩ噺妯″潡 鍏ㄧ▼璐ㄩ噺杩芥函
+        /// <summary>
+        /// 杩斿洖寮傚父闂鏉ユ簮
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
+        [HttpGet]
+        public object Get_QC_FiveMenOneRingList(string SN, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList '" + SN + "'", "h_p_QC_FiveMenOneRingList");
+
+                // 閬嶅巻鎵�鏈夎〃
+                foreach (DataTable table in ds.Tables)
+                {
+                    List<object> tableColumnList = new List<object>();
+
+                    // 娣诲姞鍒楀悕
+                    foreach (DataColumn col in table.Columns)
+                    {
+                        Type dataType = col.DataType;
+                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                        tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
+                    }
+
+                    // 灏嗘瘡涓〃鐨勫垪鍚嶅垪琛ㄦ坊鍔犲埌鎬诲垪鍚嶅垪琛�
+                    columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds;
+                objJsonResult.list = columnNameList;
+                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>
+        /// <returns></returns>
+        [Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
+        [HttpGet]
+        public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
+                List<object> columnNameList = new List<object>();
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+                //}
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
+        #region 璐ㄩ噺妯″潡 PPM缁╂晥瓒嬪娍鍥炬姤琛�
+
+        /// <summary>
+        /// PPM缁╂晥瓒嬪娍鍥炬姤琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
+        [HttpGet]
+        public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
+                List<object> columnNameList = new List<object>();
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+                //}
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
     }
 }
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
index 3453dcc..222eabd 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -181,7 +181,8 @@
                             FormId = "BD_UNITCONVERTRATE",
                             FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
                             ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
-                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE" +
+                            ",FMATERIALID.FNUMBER",
                             FilterString = "",
                             OrderString = "",
                             TopRowCount = 0,
@@ -245,6 +246,7 @@
                                 HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
                                 HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
                                 HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+                                HMaterNumber = DBUtility.ClsPub.isStrNull(arr[i, 19]),
                             };
 
                             //鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
@@ -253,7 +255,7 @@
                                     (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                                     ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
                                     ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
-                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber
                                     ,HMakeEmp,HMakeTime
                                     ,HCheckEmp,HCheckTime
                                     ,HModifyEmp,HModifyTime
@@ -261,7 +263,7 @@
                                     Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
                                     ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
                                     ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
-                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID},'{subData.HMaterNumber}'
                                     ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
                                     ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
                                     ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 1e8d9b6..810ded1 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -104,6 +104,6 @@
         public double HTaxRate; // 榛樿绋庣巼锛堥粯璁�13锛�
 
         public double HProfitRate; // 榛樿鍒╂鼎鐜囷紙榛樿0锛�
-
+        public int HProjectBillMainID; //椤圭洰鍙�
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Models/ClsKf_ICStockBillSub.cs b/WebAPI/Models/ClsKf_ICStockBillSub.cs
index 5f5b621..4ecf12d 100644
--- a/WebAPI/Models/ClsKf_ICStockBillSub.cs
+++ b/WebAPI/Models/ClsKf_ICStockBillSub.cs
@@ -74,7 +74,7 @@
         public Int64 HSourceInterID;
         public Int64 HSourceEntryID;
         public Int64 HAuxPropID;
-        public Int64 HlineTotal;
+        public double HlineTotal;
 
         public object HContainerNum { get; internal set; }
         public object HPVC { get; internal set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 0186fdd..8d4b3fe 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,12 +4,12 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2024-08-22T01:48:50.0760398Z;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+    <History>True|2024-08-26T09:21:30.8800173Z;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="bin/AlibabaCloud.EndpointUtil.dll">
       <publishTime>04/07/2020 16:33:48</publishTime>
@@ -39,139 +39,139 @@
       <publishTime>07/24/2024 10:36:58</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/22/2024 09:36:27</publishTime>
+      <publishTime>08/26/2024 17:21:20</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/22/2024 09:36:27</publishTime>
+      <publishTime>08/26/2024 17:21:20</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/18/2020 05:32:28</publishTime>
+      <publishTime>12/17/2020 21:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>08/22/2024 09:36:26</publishTime>
+      <publishTime>08/26/2024 17:21:18</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>08/22/2024 09:36:26</publishTime>
+      <publishTime>08/26/2024 17:21:18</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>07/22/2016 22:52:40</publishTime>
+      <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:16</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:16</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
-      <publishTime>03/22/2022 13:17:26</publishTime>
+      <publishTime>03/22/2022 05:17:26</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.pdb">
-      <publishTime>03/19/2022 07:39:42</publishTime>
+      <publishTime>03/18/2022 23:39:42</publishTime>
     </File>
     <File Include="bin/Grpc.Core.dll">
-      <publishTime>03/22/2022 13:17:20</publishTime>
+      <publishTime>03/22/2022 05:17:20</publishTime>
     </File>
     <File Include="bin/Grpc.Core.pdb">
-      <publishTime>03/19/2022 07:39:48</publishTime>
+      <publishTime>03/18/2022 23:39:48</publishTime>
     </File>
     <File Include="bin/grpc_csharp_ext.x64.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="bin/grpc_csharp_ext.x86.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>02/08/2023 09:47:46</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.dylib">
-      <publishTime>03/19/2022 07:38:44</publishTime>
+      <publishTime>03/18/2022 23:38:44</publishTime>
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.so">
-      <publishTime>03/19/2022 07:38:42</publishTime>
+      <publishTime>03/18/2022 23:38:42</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
-      <publishTime>03/19/2015 01:02:50</publishTime>
+      <publishTime>03/18/2015 17:02:50</publishTime>
     </File>
     <File Include="bin/Microsoft.CSharp.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 19:48:56</publishTime>
+      <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:16</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:16</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/08/2023 15:09:56</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 09:07:56</publishTime>
+      <publishTime>10/23/2021 01:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.pdb">
-      <publishTime>10/23/2021 17:07:56</publishTime>
+      <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
-    </File>
-    <File Include="bin/NPOI.OpenXmlFormats.dll">
       <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:14</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:14</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:15</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:15</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
-      <publishTime>08/31/2012 06:22:50</publishTime>
+      <publishTime>08/30/2012 22:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:15</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>08/22/2024 09:36:23</publishTime>
+      <publishTime>08/26/2024 17:21:15</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
-      <publishTime>02/16/2015 01:57:08</publishTime>
+      <publishTime>02/15/2015 17:57:08</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
-      <publishTime>07/19/2017 18:01:28</publishTime>
+      <publishTime>07/19/2017 10:01:28</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -195,10 +195,10 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
-      <publishTime>08/19/2014 18:03:34</publishTime>
+      <publishTime>08/19/2014 10:03:34</publishTime>
     </File>
     <File Include="bin/System.Memory.dll">
-      <publishTime>04/18/2019 00:24:34</publishTime>
+      <publishTime>04/17/2019 16:24:34</publishTime>
     </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -207,13 +207,13 @@
       <publishTime>02/20/2015 04:10:46</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 21:00:36</publishTime>
+      <publishTime>11/28/2018 13:00:36</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Primitives.dll">
       <publishTime>02/20/2015 04:10:46</publishTime>
     </File>
     <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
-      <publishTime>09/19/2018 03:38:10</publishTime>
+      <publishTime>09/18/2018 19:38:10</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -222,7 +222,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 20:58:44</publishTime>
+      <publishTime>11/28/2018 12:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -237,37 +237,37 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 21:01:26</publishTime>
+      <publishTime>11/28/2018 13:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 21:01:00</publishTime>
+      <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>01/28/2015 12:02:18</publishTime>
+      <publishTime>01/28/2015 04:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 23:26:04</publishTime>
+      <publishTime>02/11/2014 15:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>01/28/2015 12:02:32</publishTime>
+      <publishTime>01/28/2015 04:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Xml.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -279,22 +279,22 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:17</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>08/22/2024 09:36:24</publishTime>
+      <publishTime>08/26/2024 17:21:17</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
-      <publishTime>11/24/2014 19:18:48</publishTime>
+      <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/22/2024 09:36:30</publishTime>
+      <publishTime>08/26/2024 17:21:24</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/22/2024 09:36:30</publishTime>
+      <publishTime>08/26/2024 17:21:24</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>07/18/2013 01:03:52</publishTime>
+      <publishTime>07/17/2013 17:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
       <publishTime>11/29/2018 21:26:02</publishTime>
@@ -303,190 +303,190 @@
       <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="Config/kdapi.config">
-      <publishTime>08/15/2022 15:46:13</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>02/08/2023 09:47:46</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="grpc_csharp_ext.x64.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="grpc_csharp_ext.x86.dll">
-      <publishTime>03/22/2022 13:17:22</publishTime>
+      <publishTime>03/22/2022 05:17:22</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="libgrpc_csharp_ext.x64.dylib">
-      <publishTime>03/19/2022 07:38:44</publishTime>
+      <publishTime>03/18/2022 23:38:44</publishTime>
     </File>
     <File Include="libgrpc_csharp_ext.x64.so">
-      <publishTime>03/19/2022 07:38:42</publishTime>
+      <publishTime>03/18/2022 23:38:42</publishTime>
     </File>
     <File Include="libman.json">
-      <publishTime>07/18/2023 17:26:29</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/15/2024 22:14:00</publishTime>
+      <publishTime>08/16/2024 09:07:08</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>03/15/2022 10:06:42</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>03/31/2023 09:57:09</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>03/31/2023 09:57:08</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
-      <publishTime>05/13/2024 10:26:00</publishTime>
+      <publishTime>05/25/2024 09:46:41</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/22/2024 09:48:49</publishTime>
+      <publishTime>08/26/2024 17:21:29</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
new file mode 100644
index 0000000..d16ec41
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index 8d164d4..f063768 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+=======
     <DeleteExistingFiles>True</DeleteExistingFiles>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
+<<<<<<< HEAD
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+=======
     <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
index f7a5d8d..4a9ba5f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
-    <History>True|2024-08-22T02:23:09.0739592Z;True|2024-08-22T09:03:26.5727554+08:00;False|2024-08-22T09:02:31.4240959+08:00;True|2024-08-22T08:47:36.3625451+08:00;True|2024-08-21T16:51:37.2382964+08:00;True|2024-08-21T16:25:44.7030554+08:00;True|2024-08-21T16:21:11.7076342+08:00;False|2024-08-21T16:20:13.4190052+08:00;True|2024-08-21T16:00:41.9895716+08:00;True|2024-08-21T14:57:09.3460834+08:00;True|2024-08-21T10:38:36.4128047+08:00;True|2024-08-21T08:14:03.4933362+08:00;</History>
+    <History>True|2024-08-23T00:57:01.4824044Z;True|2024-08-22T16:32:28.5510545+08:00;True|2024-08-22T15:05:33.7972126+08:00;True|2024-08-22T13:12:04.7949636+08:00;True|2024-08-22T12:38:36.4895558+08:00;True|2024-08-22T10:56:52.4037571+08:00;True|2024-08-22T10:23:09.0739592+08:00;True|2024-08-22T09:03:26.5727554+08:00;False|2024-08-22T09:02:31.4240959+08:00;True|2024-08-22T08:47:36.3625451+08:00;True|2024-08-21T16:51:37.2382964+08:00;True|2024-08-21T16:25:44.7030554+08:00;True|2024-08-21T16:21:11.7076342+08:00;False|2024-08-21T16:20:13.4190052+08:00;True|2024-08-21T16:00:41.9895716+08:00;True|2024-08-21T14:57:09.3460834+08:00;True|2024-08-21T10:38:36.4128047+08:00;True|2024-08-21T08:14:03.4933362+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
@@ -45,19 +45,19 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/22/2024 09:03:10</publishTime>
+      <publishTime>08/23/2024 08:56:36</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/22/2024 09:03:10</publishTime>
+      <publishTime>08/23/2024 08:56:36</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>08/22/2024 09:03:08</publishTime>
+      <publishTime>08/23/2024 08:56:33</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>08/22/2024 09:03:08</publishTime>
+      <publishTime>08/23/2024 08:56:33</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
@@ -288,13 +288,13 @@
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/22/2024 10:23:00</publishTime>
+      <publishTime>08/23/2024 08:56:45</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/22/2024 10:23:00</publishTime>
+      <publishTime>08/23/2024 08:56:45</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
-      <publishTime>08/22/2024 10:23:05</publishTime>
+      <publishTime>08/23/2024 08:56:56</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
@@ -489,7 +489,7 @@
       <publishTime>04/29/2024 08:30:03</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/21/2024 08:14:02</publishTime>
+      <publishTime>08/22/2024 15:05:31</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml
new file mode 100644
index 0000000..5ff70fc
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user
new file mode 100644
index 0000000..a32fee2
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
index 5ff70fc..e7a2fa6 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
@@ -4,10 +4,10 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
     <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index 8886742..a76a891 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2024-08-16T08:55:32.0918962Z;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+    <History>True|2024-08-26T02:17:08.7733750Z;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
     <_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
   </PropertyGroup>
   <ItemGroup>
@@ -45,28 +45,28 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/16/2024 16:55:13</publishTime>
+      <publishTime>08/26/2024 10:16:57</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/16/2024 16:55:13</publishTime>
+      <publishTime>08/26/2024 10:16:57</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>08/16/2024 16:55:11</publishTime>
+      <publishTime>08/26/2024 10:16:54</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>08/16/2024 16:55:11</publishTime>
+      <publishTime>08/26/2024 10:16:54</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>08/16/2024 16:55:04</publishTime>
+      <publishTime>08/26/2024 10:16:44</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>08/16/2024 16:55:04</publishTime>
+      <publishTime>08/26/2024 10:16:44</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/16/2024 16:55:06</publishTime>
+      <publishTime>08/26/2024 10:16:47</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/16/2024 16:55:06</publishTime>
+      <publishTime>08/26/2024 10:16:47</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,25 +147,25 @@
       <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>08/16/2024 16:36:26</publishTime>
+      <publishTime>08/26/2024 10:16:41</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>08/16/2024 16:36:26</publishTime>
+      <publishTime>08/26/2024 10:16:41</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>08/16/2024 16:46:45</publishTime>
+      <publishTime>08/26/2024 10:16:43</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>08/16/2024 16:46:45</publishTime>
+      <publishTime>08/26/2024 10:16:43</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>08/16/2024 16:53:38</publishTime>
+      <publishTime>08/26/2024 10:16:43</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>08/16/2024 16:53:38</publishTime>
+      <publishTime>08/26/2024 10:16:43</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
@@ -279,19 +279,19 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>08/16/2024 16:35:48</publishTime>
+      <publishTime>08/26/2024 10:09:15</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>08/16/2024 16:35:48</publishTime>
+      <publishTime>08/26/2024 10:09:15</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/16/2024 16:55:20</publishTime>
+      <publishTime>08/26/2024 10:17:06</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/16/2024 16:55:20</publishTime>
+      <publishTime>08/26/2024 10:17:06</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>08/16/2024 16:55:28</publishTime>
@@ -489,7 +489,7 @@
       <publishTime>04/29/2024 08:30:03</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/16/2024 16:53:22</publishTime>
+      <publishTime>08/26/2024 10:17:07</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 2667c8e..0b0c1a7 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
 		<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
 		<!--<add key="FileIP" value="http://localhost:8080/" />-->
 		<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
-		<!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--><!--棰滃彴寮忔満-->
+		<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--棰滃彴寮忔満-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
 		<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
 		<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->	<!--娴嬭瘯鏈嶅姟鍣�-->
 		<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    鏈湴-->
 		<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->	<!--闄堥洴闈欐湰鍦伴厤缃�-->
-		<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>	<!--缈佹稕娑涙湰鍦伴厤缃�-->
+		<!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>-->	<!--缈佹稕娑涙湰鍦伴厤缃�-->
 		<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
 		<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
 		
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c77bbf6..f882051 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>JFAPI</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
new file mode 100644
index 0000000..2982c4e
--- /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..4e59507
--- /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
new file mode 100644
index 0000000..d6e21aa
--- /dev/null
+++ 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 eaf44fd..d27e238 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,20 @@
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\鏅轰簯LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+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
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
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..a74353c
--- /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.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..b33254c
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,6 @@
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..2982c4e
--- /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..4e59507
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1