From c16f60af8b427aeaf451b41361f690d5f3a4b4e6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 09 十一月 2022 14:13:28 +0800
Subject: [PATCH] 条码主档删除功能

---
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index c93a272..ea4537e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -572,27 +572,21 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                DataSet Ds, Ds2;
+                DataSet Ds;
                 Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList");
                 if (Ds.Tables[0].Rows.Count != 0)
                 {
-                    oCN.BeginTran();
-                    Ds2 = oCN.RunProcReturn("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString(), "Gy_BarCodeBill");
-                    if (Ds2.Tables[0].Rows.Count != 0)
-                    {
-                        oCN.Commit();
-                        objJsonResult.code = "1";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍒犻櫎鎴愬姛";
-                        objJsonResult.data = null;
-                        return objJsonResult;
-                    }
-                    oCN.RollBack();
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鍒犻櫎澶辫触";
+                   oCN.BeginTran();
+                   oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());
+
+                    oCN.Commit();
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎鎴愬姛";
                     objJsonResult.data = null;
                     return objJsonResult;
+
+
                 }
                 else
                 {
@@ -605,6 +599,7 @@
             }
             catch (Exception e)
             {
+                oCN.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = e.Message;

--
Gitblit v1.9.1