From d1b14d00d9ee4ff4a1b271e6b4fe094f5049a55f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 17 三月 2025 09:23:16 +0800
Subject: [PATCH] 采购入库单:下推采购退料单

---
 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index f67fd55..030c263 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -321,7 +321,7 @@
                 string HAddress = list[0].HAddress;
                 string HLinkMan = list[0].HLinkMan;
                 string HLinkPhone = list[0].HLinkPhone;
-                string HBankAccount = list[0].HMobilePhone;
+                string HBankAccount = list[0].HBankAccount;
                 string HFax = list[0].HFax;
                 string HPostalCode = list[0].HPostalCode;
                 string HEmail = list[0].HEmail;
@@ -517,7 +517,7 @@
                 string HAddress = list[0].HAddress;
                 string HLinkMan = list[0].HLinkMan;
                 string HLinkPhone = list[0].HLinkPhone;
-                string HBankAccount = list[0].HMobilePhone;
+                string HBankAccount = list[0].HBankAccount;
                 string HFax = list[0].HFax;
                 string HPostalCode = list[0].HPostalCode;
                 string HEmail = list[0].HEmail;
@@ -694,12 +694,36 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+
+                    //鍒犻櫎鍓嶆帶鍒�=========================================      
+                    string sql1 = "exec h_p_Gy_Supplier_BeforeDelCtrl " + HItemID + ",'" + User + "'";
+                    ds = oCN.RunProcReturn(sql1, "h_p_Gy_Supplier_BeforeDelCtrl");
+                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+
+                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //==================================================================================  
+
                     oCN.BeginTran();
                     //
                     if (oGroup.DeleteByID(HItemID))
                     {
                         //鍒犻櫎瀛愯〃
                         oCN.RunProc("delete from Gy_Supplier_PayPlan where HSupID='" + HItemID + "'");
+                        oCN.RunProc("delete from Gy_Supplier_Link where HSupID='" + HItemID + "'");
                         oCN.Commit();
                         //鍐欏叆鏃ュ織
                         ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oGroupHlp.omodel.HNumber + ",鍚嶇О锛�" + oGroupHlp.omodel.HName, ClsPub.CurUserName);

--
Gitblit v1.9.1