From 6b58db539723a88c5d50ba90096389fa913136fd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 22 五月 2024 11:28:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 18ab08f..55daeae 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1762,8 +1762,24 @@
if (IsAudit == 1) //鍙嶅叧闂彁浜�
{
//鍙嶅叧闂彁浜�
+ oBill.oCn.BeginTran();
if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+
+ //鎺у埗鍏宠仈鏁伴噺,鍒ゆ柇鍙嶅叧闂悗锛岀敓浜ц鍗曚笅鎺ㄦ祦杞崱鎬绘暟鏄惁瓒呰繃璁″垝鏁伴噺
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + lngBillKey, "h_p_Sc_ProcessExchangeBill_Checkqty");
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]).ToString();
+ objJsonResult.data = null;
+
+ oBill.oCn.RollBack();
+ return objJsonResult;
+ }
+
+ oBill.oCn.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
--
Gitblit v1.9.1