From 910028f450662294ff7ea7de5894a42010416ad7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 26 八月 2024 17:28:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 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 +
 WebAPI/WebAPI.csproj.user                                             |    9 
 BLL/bin/Release/SQLHelper.dll                                         |    0 
 DAL/bin/Release/DBUtility.pdb                                         |    0 
 DAL/bin/Release/Model.dll                                             |    0 
 DAL/应付管理/ClsYF_PayMentBill.cs                                         |   59 ++
 DBUtility/bin/Release/Pub_Class.dll                                   |    0 
 DBUtility/bin/Release/Pub_Control.dll                                 |    0 
 Model/bin/Release/SQLHelper.pdb                                       |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user          |  500 ++++++++++++++++++++++++++
 DAL/bin/Release/Pub_Control.pdb                                       |    0 
 DAL/bin/Release/DAL.pdb                                               |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache   |    0 
 SQLHelper/obj/Release/SQLHelper.dll                                   |    0 
 DAL/应收管理/ClsYS_ReceiveBill.cs                                         |    4 
 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml               |   20 +
 Model/bin/Release/Pub_Control.pdb                                     |    0 
 BLL/bin/Release/Model.dll                                             |    0 
 BLL/bin/Release/DAL.pdb                                               |    0 
 Model/bin/Release/Pub_Class.pdb                                       |    0 
 WebAPI/Models/ClsGy_Material_Model.cs                                 |    2 
 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml               |   16 
 BLL/bin/Release/Model.pdb                                             |    0 
 DAL/bin/Release/DAL.dll                                               |    0 
 PayM/obj/Debug/Interop.gregn6Lib.dll                                  |    0 
 DAL/bin/Release/Model.pdb                                             |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll                              |    0 
 SQLHelper/obj/Release/SQLHelper.pdb                                   |    0 
 Model/obj/Release/Model.pdb                                           |    0 
 BLL/bin/Release/BLL.pdb                                               |    0 
 DBUtility/bin/Release/DBUtility.pdb                                   |    0 
 DBUtility/bin/Release/DBUtility.dll                                   |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                              |    0 
 Model/bin/Release/Pub_Control.dll                                     |    0 
 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache |    0 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache        |    0 
 Pub_Control/bin/Release/Pub_Class.pdb                                 |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user         |  167 ++++----
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt      |   14 
 Pub_Control/bin/Release/Pub_Class.dll                                 |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                              |    0 
 WebAPI/Controllers/GG_NoticeController.cs                             |   46 ++
 WebAPI/Models/ClsKf_ICStockBillSub.cs                                 |    2 
 BLL/bin/Release/Pub_Control.pdb                                       |    0 
 Pub_Class/bin/Release/Pub_Class.pdb                                   |    0 
 Pub_Control/bin/Release/Pub_Control.dll                               |    0 
 BLL/bin/Release/DBUtility.pdb                                         |    0 
 DAL/bin/Release/SQLHelper.dll                                         |    0 
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user        |   40 +-
 Model/bin/Release/DBUtility.pdb                                       |    0 
 SQLHelper/bin/Release/SQLHelper.dll                                   |    0 
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs                   |   57 ++
 SQLHelper/bin/Release/Pub_Class.pdb                                   |    0 
 BLL/bin/Release/Pub_Control.dll                                       |    0 
 Pub_Class/bin/Release/Pub_Class.dll                                   |    0 
 DAL/bin/Release/SQLHelper.pdb                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache         |    0 
 PayM/obj/Debug/PayM.csproj.ResolveComReference.cache                  |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache        |    0 
 SQLHelper/bin/Release/Pub_Class.dll                                   |    0 
 SQLHelper/bin/Release/SQLHelper.pdb                                   |    0 
 DBUtility/obj/Release/DBUtility.pdb                                   |    0 
 Model/bin/Release/DBUtility.dll                                       |    0 
 DAL/bin/Release/Pub_Class.pdb                                         |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml              |    8 
 BLL/bin/Release/DBUtility.dll                                         |    0 
 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache      |    0 
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml             |    4 
 BLL/bin/Release/BLL.dll                                               |    0 
 Pub_Control/bin/Release/Pub_Control.pdb                               |    0 
 DBUtility/obj/Release/DBUtility.dll                                   |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb                              |    0 
 Model/obj/Release/Model.dll                                           |    0 
 BLL/bin/Release/Pub_Class.dll                                         |    0 
 NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache    |    0 
 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs          |    2 
 DBUtility/bin/Release/SQLHelper.dll                                   |    0 
 Model/obj/Release/Model.csproj.AssemblyReference.cache                |    0 
 Model/bin/Release/Model.pdb                                           |    0 
 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs                   |  104 +++++
 DBUtility/bin/Release/SQLHelper.pdb                                   |    0 
 DAL/bin/Release/Pub_Class.dll                                         |    0 
 Model/bin/Release/Pub_Class.dll                                       |    0 
 WebAPI/Controllers/CGGL/YF_PayMentBillController.cs                   |    8 
 WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user          |    6 
 Model/bin/Release/Model.dll                                           |    0 
 DBUtility/bin/Release/Pub_Class.pdb                                   |    0 
 BLL/bin/Release/Pub_Class.pdb                                         |    0 
 Model/bin/Release/SQLHelper.dll                                       |    0 
 95 files changed, 985 insertions(+), 133 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/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 147b13a..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..5ba05d2 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,59 @@
         }
         #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;
+            }
+        }
 
         /// <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/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/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/FolderProfile2.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
new file mode 100644
index 0000000..aba1967
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
@@ -0,0 +1,20 @@
+锘�<?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>
+<<<<<<< HEAD
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+=======
+    <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
+    <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..9888479
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -0,0 +1,500 @@
+锘�<?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>
+<<<<<<< HEAD
+    <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
+    <History>True|2024-08-26T07:01:15.1678813Z;True|2024-08-26T14:58:26.9690997+08:00;True|2024-08-26T14:54:35.5794054+08:00;True|2024-08-26T14:32:03.8719422+08:00;False|2024-08-26T14:31:43.2800075+08:00;True|2024-08-23T14:37:38.1141512+08:00;</History>
+  </PropertyGroup>
+  <ItemGroup>
+    <File Include="apiapp.json">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+      <publishTime>04/07/2020 16:33:48</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+      <publishTime>04/25/2023 17:49:04</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+      <publishTime>07/31/2024 20:50:30</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+      <publishTime>08/06/2024 18:07:52</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+      <publishTime>11/22/2022 11:24:18</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+      <publishTime>08/08/2024 19:43:22</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaUtil.dll">
+      <publishTime>07/15/2024 20:25:56</publishTime>
+    </File>
+    <File Include="bin/AlibabaCloud.TeaXML.dll">
+      <publishTime>08/03/2022 21:46:08</publishTime>
+    </File>
+    <File Include="bin/Aliyun.Credentials.dll">
+      <publishTime>07/24/2024 10:36:58</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.dll">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/Antlr3.Runtime.pdb">
+      <publishTime>02/22/2013 16:43:40</publishTime>
+    </File>
+    <File Include="bin/BLL.dll">
+      <publishTime>08/23/2024 14:37:21</publishTime>
+    </File>
+    <File Include="bin/BLL.pdb">
+      <publishTime>08/23/2024 14:37:21</publishTime>
+    </File>
+    <File Include="bin/BouncyCastle.Crypto.dll">
+      <publishTime>12/18/2020 05:32:28</publishTime>
+    </File>
+    <File Include="bin/DAL.dll">
+      <publishTime>08/23/2024 14:37:19</publishTime>
+    </File>
+    <File Include="bin/DAL.pdb">
+      <publishTime>08/23/2024 14:37:19</publishTime>
+    </File>
+    <File Include="bin/Dapper.dll">
+      <publishTime>07/22/2016 22:52:40</publishTime>
+    </File>
+    <File Include="bin/DBUtility.dll">
+      <publishTime>08/23/2024 14:37:15</publishTime>
+    </File>
+    <File Include="bin/DBUtility.pdb">
+      <publishTime>08/23/2024 14:37:15</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.dll">
+      <publishTime>03/22/2022 13:17:26</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.Api.pdb">
+      <publishTime>03/19/2022 07:39:42</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.dll">
+      <publishTime>03/22/2022 13:17:20</publishTime>
+    </File>
+    <File Include="bin/Grpc.Core.pdb">
+      <publishTime>03/19/2022 07:39:48</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.dll">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+      <publishTime>05/09/2021 01:08:30</publishTime>
+    </File>
+    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="bin/libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+      <publishTime>03/19/2015 01:02:50</publishTime>
+    </File>
+    <File Include="bin/Microsoft.CSharp.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/Microsoft.Web.Infrastructure.dll">
+      <publishTime>07/25/2012 19:48:56</publishTime>
+    </File>
+    <File Include="bin/Model.dll">
+      <publishTime>08/23/2024 14:37:16</publishTime>
+    </File>
+    <File Include="bin/Model.pdb">
+      <publishTime>08/23/2024 14:37:16</publishTime>
+    </File>
+    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/Newtonsoft.Json.dll">
+      <publishTime>03/08/2023 15:09:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.dll">
+      <publishTime>10/23/2021 09:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXml4Net.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 09:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.OpenXmlFormats.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/NPOI.pdb">
+      <publishTime>10/23/2021 17:07:54</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.dll">
+      <publishTime>08/23/2024 14:37:13</publishTime>
+    </File>
+    <File Include="bin/Pub_Class.pdb">
+      <publishTime>08/23/2024 14:37:13</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.dll">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/Pub_Control.pdb">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/RestSharp.dll">
+      <publishTime>08/31/2012 06:22:50</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.dll">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/SQLHelper.pdb">
+      <publishTime>08/23/2024 14:37:14</publishTime>
+    </File>
+    <File Include="bin/Swashbuckle.Core.dll">
+      <publishTime>02/16/2015 01:57:08</publishTime>
+    </File>
+    <File Include="bin/System.Buffers.dll">
+      <publishTime>07/19/2017 18:01:28</publishTime>
+    </File>
+    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Configuration.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.DataSetExtensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Data.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Drawing.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.EnterpriseServices.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+      <publishTime>08/19/2014 18:03:34</publishTime>
+    </File>
+    <File Include="bin/System.Memory.dll">
+      <publishTime>04/18/2019 00:24:34</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Extensions.dll">
+      <publishTime>02/20/2015 04:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Formatting.dll">
+      <publishTime>11/28/2018 21:00:36</publishTime>
+    </File>
+    <File Include="bin/System.Net.Http.Primitives.dll">
+      <publishTime>02/20/2015 04:10:46</publishTime>
+    </File>
+    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+      <publishTime>09/19/2018 03:38:10</publishTime>
+    </File>
+    <File Include="bin/System.Runtime.Serialization.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.ApplicationServices.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Cors.dll">
+      <publishTime>11/28/2018 20:58:44</publishTime>
+    </File>
+    <File Include="bin/System.Web.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.DynamicData.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Entity.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Extensions.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.Helpers.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.Cors.dll">
+      <publishTime>11/28/2018 21:01:26</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.dll">
+      <publishTime>11/28/2018 21:01:00</publishTime>
+    </File>
+    <File Include="bin/System.Web.Http.WebHost.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="bin/System.Web.Mvc.dll">
+      <publishTime>01/28/2015 12:02:18</publishTime>
+    </File>
+    <File Include="bin/System.Web.Optimization.dll">
+      <publishTime>02/11/2014 23:26:04</publishTime>
+    </File>
+    <File Include="bin/System.Web.Razor.dll">
+      <publishTime>01/28/2015 12:02:32</publishTime>
+    </File>
+    <File Include="bin/System.Web.Services.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.Deployment.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Web.WebPages.Razor.dll">
+      <publishTime>01/28/2015 12:04:30</publishTime>
+    </File>
+    <File Include="bin/System.Xml.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/System.Xml.Linq.dll">
+      <publishTime>09/26/2012 03:16:08</publishTime>
+    </File>
+    <File Include="bin/Tea.dll">
+      <publishTime>05/09/2023 10:43:40</publishTime>
+    </File>
+    <File Include="bin/TopSdk.dll">
+      <publishTime>08/23/2024 10:42:15</publishTime>
+    </File>
+    <File Include="bin/TopSdk.pdb">
+      <publishTime>08/23/2024 10:42:15</publishTime>
+    </File>
+    <File Include="bin/WebActivatorEx.dll">
+      <publishTime>11/24/2014 19:18:48</publishTime>
+    </File>
+    <File Include="bin/WebAPI.dll">
+      <publishTime>08/26/2024 15:01:09</publishTime>
+    </File>
+    <File Include="bin/WebAPI.pdb">
+      <publishTime>08/26/2024 15:01:09</publishTime>
+    </File>
+    <File Include="bin/WebAPI.XmlSerializers.dll">
+      <publishTime>08/26/2024 15:01:14</publishTime>
+    </File>
+    <File Include="bin/WebGrease.dll">
+      <publishTime>07/18/2013 01:03:52</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+      <publishTime>11/29/2018 21:26:02</publishTime>
+    </File>
+    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+      <publishTime>11/29/2018 21:26:30</publishTime>
+    </File>
+    <File Include="Config/kdapi.config">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/bootstrap.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/bootstrap.min.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="Content/Site.css">
+      <publishTime>04/06/2023 15:57:02</publishTime>
+    </File>
+    <File Include="DLL/BLL.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/DAL.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/DBUtility.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Model.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Newtonsoft.Json.Net35.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Pub_Class.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/Pub_Control.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="DLL/SQLHelper.dll">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.eot">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.svg">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.ttf">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="fonts/glyphicons-halflings-regular.woff">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Global.asax">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x64.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="grpc_csharp_ext.x86.dll">
+      <publishTime>03/22/2022 13:17:22</publishTime>
+    </File>
+    <File Include="Index.html">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.dylib">
+      <publishTime>03/19/2022 07:38:44</publishTime>
+    </File>
+    <File Include="libgrpc_csharp_ext.x64.so">
+      <publishTime>03/19/2022 07:38:42</publishTime>
+    </File>
+    <File Include="libman.json">
+      <publishTime>07/12/2023 08:14:22</publishTime>
+    </File>
+    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="packages.config">
+      <publishTime>08/15/2024 16:27:01</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/bootstrap.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery-1.10.2.min.map">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Scripts/modernizr-2.6.2.js">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Shared/Error.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/Shared/_Layout.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/web.config">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Views/_ViewStart.cshtml">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+      <publishTime>04/06/2023 15:57:04</publishTime>
+    </File>
+    <File Include="Web References/WebS/Reference.map">
+      <publishTime>05/06/2024 13:47:58</publishTime>
+    </File>
+    <File Include="Web.config">
+      <publishTime>08/23/2024 14:37:34</publishTime>
+    </File>
+  </ItemGroup>
+=======
+    <History>False|2024-08-26T01:46:23.8837034Z;False|2024-08-26T09:42:50.5108789+08:00;False|2024-08-26T09:33:16.5156645+08:00;False|2024-08-26T09:31:17.8659550+08:00;False|2024-08-26T09:30:43.9441152+08:00;False|2024-08-26T08:57:22.1073145+08:00;False|2024-08-26T08:56:38.8704796+08:00;</History>
+  </PropertyGroup>
+>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
index 8d164d4..f063768 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+=======
     <DeleteExistingFiles>True</DeleteExistingFiles>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <ExcludeApp_Data>False</ExcludeApp_Data>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
+<<<<<<< HEAD
+    <PublishUrl>D:\缃戠珯鍙戝竷\API</PublishUrl>
+=======
     <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
+>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
     <WebPublishMethod>FileSystem</WebPublishMethod>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
index 58f75ae..4a9ba5f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
@@ -4,12 +4,12 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2024-08-22T05:54:00.8671096Z;True|2024-08-22T13:51:47.3774868+08:00;True|2024-08-22T11:08:16.6367044+08:00;False|2024-08-22T11:08:06.3321501+08:00;True|2024-08-22T10:54:44.9493185+08:00;False|2024-08-22T10:54:36.6051798+08:00;True|2024-08-21T16:59:42.2314838+08:00;True|2024-08-21T16:15:39.3970105+08:00;True|2024-08-21T16:15:21.1951828+08:00;False|2024-08-21T16:15:00.1718456+08:00;True|2024-08-21T15:52:14.1734637+08:00;True|2024-08-21T15:51:10.6106267+08:00;False|2024-08-21T15:50:05.7560087+08:00;True|2024-08-21T14:26:54.6150600+08:00;True|2024-08-21T10:36:07.4567215+08:00;True|2024-08-21T10:09:07.9820150+08:00;True|2024-08-21T10:08:57.7601146+08:00;False|2024-08-21T10:08:41.4637507+08:00;True|2024-08-19T15:51:06.3264524+08:00;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
-    <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+    <_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
+    <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">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="bin/AlibabaCloud.EndpointUtil.dll">
       <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/22/2024 13:53:48</publishTime>
+      <publishTime>08/23/2024 08:56:36</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/22/2024 13:53:48</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 13:53:47</publishTime>
+      <publishTime>08/23/2024 08:56:33</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>08/22/2024 13:53:47</publishTime>
+      <publishTime>08/23/2024 08:56:33</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>08/22/2024 13:53:45</publishTime>
+      <publishTime>08/22/2024 09:03:00</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>08/22/2024 13:53:45</publishTime>
+      <publishTime>08/22/2024 09:03:00</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
       <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.dylib">
       <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/22/2024 13:53:45</publishTime>
+      <publishTime>08/22/2024 09:03:03</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/22/2024 13:53:45</publishTime>
+      <publishTime>08/22/2024 09:03:03</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,25 +147,25 @@
       <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>08/22/2024 13:53:43</publishTime>
+      <publishTime>08/22/2024 09:02:58</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>08/22/2024 13:53:43</publishTime>
+      <publishTime>08/22/2024 09:02:58</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>08/22/2024 13:53:44</publishTime>
+      <publishTime>08/22/2024 09:02:59</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>08/22/2024 13:53:44</publishTime>
+      <publishTime>08/22/2024 09:02:59</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>08/22/2024 13:53:44</publishTime>
+      <publishTime>08/22/2024 09:02:59</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>08/22/2024 13:53:44</publishTime>
+      <publishTime>08/22/2024 09:02:59</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,7 +246,7 @@
       <publishTime>11/28/2018 21:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,19 +279,22 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
-      <publishTime>08/21/2024 16:02:12</publishTime>
+      <publishTime>08/16/2024 16:35:48</publishTime>
     </File>
     <File Include="bin/TopSdk.pdb">
-      <publishTime>08/21/2024 16:02:14</publishTime>
+      <publishTime>08/16/2024 16:35:48</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/22/2024 13:53:53</publishTime>
+      <publishTime>08/23/2024 08:56:45</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/22/2024 13:53:53</publishTime>
+      <publishTime>08/23/2024 08:56:45</publishTime>
+    </File>
+    <File Include="bin/WebAPI.XmlSerializers.dll">
+      <publishTime>08/23/2024 08:56:56</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
@@ -303,58 +306,58 @@
       <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="Config/kdapi.config">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:43</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:43</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:43</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:43</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:44</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="grpc_csharp_ext.x64.dll">
       <publishTime>03/22/2022 13:17:22</publishTime>
@@ -363,7 +366,7 @@
       <publishTime>03/22/2022 13:17:22</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="libgrpc_csharp_ext.x64.dylib">
       <publishTime>03/19/2022 07:38:44</publishTime>
@@ -372,121 +375,121 @@
       <publishTime>03/19/2022 07:38:42</publishTime>
     </File>
     <File Include="libman.json">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:47</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:45</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/16/2024 09:07:08</publishTime>
+      <publishTime>08/16/2024 08:34:04</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/15/2024 12:55:46</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
-      <publishTime>05/25/2024 09:46:41</publishTime>
+      <publishTime>04/29/2024 08:30:03</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/22/2024 13:53:59</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/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 53460bf..7c6d31f 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,6 +1,10 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+<<<<<<< HEAD
+    <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+=======
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
@@ -9,7 +13,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
@@ -21,6 +25,7 @@
     <ProjectView>ProjectFiles</ProjectView>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
+>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 700d9e9..c98028c 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index c6b4d80..71c316a 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 09317e3..d6e21aa 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 8cd2796..d27e238 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,3 +4,17 @@
 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/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 700d9e9..c98028c 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index c6b4d80..71c316a 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 09317e3..a74353c 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ

--
Gitblit v1.9.1