From 2bb4e8c477e83df7bd16585b523e532fb258e685 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 六月 2024 15:50:46 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 4c3302f..6f70605 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1391,6 +1391,22 @@
oCN.RunProc("delete from Xs_SeOrderBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
+
+ //鍐欏叆鏃ュ織
+ string Operation = "鍒犻櫎";
+ string ComputerName = System.Net.Dns.GetHostName(); //璁惧鍚嶇О
+ string WorkList = Operation + "鍗曟嵁锛屽崟鎹彿锛�" + BillOld.omodel.HBillNo;
+ string MvarReportTitle = BillOld.MvarReportTitle; //妯″潡
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ string IPAddress = "";
+ //string IPAddress = Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString(); //IP鍦板潃
+ //string IPAddress = System.Web.HttpContext.Current.Request.UserHostAddress;
+
+ oCN.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + user + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','" + Operation + "')"
+ );
+
+
//鍒犻櫎鍚庢帶鍒�==================================================================================
string sql2 = "exec h_p_Xs_SeOrderBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
ds = oCN.RunProcReturn(sql2, "h_p_Xs_SeOrderBill_AfterDelCtrl");
@@ -1775,9 +1791,40 @@
//杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
if (IsAudit == 0) //鍏抽棴鎻愪氦
{
+ oBill.oCn.BeginTran();
//鍏抽棴鎻愪氦
if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ //鍏抽棴鍚庢帶鍒�=========================================
+ string sql_afterClose = "exec h_p_Xs_SeOrderBill_AfterCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ DataSet ds_afterClose = oBill.oCn.RunProcReturn(sql_afterClose, "h_p_Xs_SeOrderBill_AfterCloseCtrl");
+ if (ds_afterClose == null || ds_afterClose.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛屽師鍥狅細鍏抽棴鍚庢帶鍒堕敊璇紝璇疯仈绯荤綉缁滅鐞嗕汉鍛橈紒";
+ objJsonResult.data = null;
+ oBill.oCn.RollBack();
+
+ return objJsonResult;
+ }
+ else
+ {
+ if (ds_afterClose.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛屽師鍥狅細" + ds_afterClose.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oBill.oCn.RollBack();
+
+ return objJsonResult;
+ }
+ }
+ //=========================================
+
+ oBill.oCn.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍏抽棴鎴愬姛";
@@ -1786,6 +1833,8 @@
}
else
{
+ oBill.oCn.RollBack();
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -1961,7 +2010,7 @@
if (IsAudit == 0) //琛屽叧闂彁浜�
{
//琛屽叧闂彁浜�
- if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CloseRow(lngBillKey,HEntryID,oBill.omodel.HBillNo,CurUserName, "h_p_Xs_SeOrderBill_AfterEntryCloseCtrl", ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1