From c0cee04d997030777bd85d198d82cc2567f4773f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 02 二月 2024 18:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DBUtility/业务单据/ClsXt_BaseBill.cs | 164 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 140 insertions(+), 24 deletions(-)
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index 1669338..c98eef1 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Data;
+using System.Windows.Forms;
namespace DBUtility
{
@@ -23,6 +24,8 @@
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
public SQLHelper.ClsCNK3 oK3Cn = new SQLHelper.ClsCNK3();
public SQLHelper.ClsCNK3 oCnK3 = new SQLHelper.ClsCNK3();
+ string ComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
+ string IPAddress=""; //璁惧IP
public ClsXt_BaseBill()
{
@@ -71,6 +74,44 @@
throw (e);
}
}
+ //鍙嶄綔搴熷崟鎹�(鍖呭惈鍐欏叆鏃ュ織) 2024-01-31
+ public bool AbandonCancelltion(Int64 lngBillKey, string HBillNo, string sUser, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ DataSet ds = oCn.RunProcReturn("select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString(), MvarItemKey);
+ if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=3 Where HInterID=" + lngBillKey.ToString());
+ }
+ else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
+ }
+ else
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='',HDeleteDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
+ }
+
+ //鍐欏叆鏃ュ織
+ string WorkList = "鍙嶄綔搴熷崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','鍙嶄綔搴�')"
+ );
+
+ sReturn = "鍙嶄綔搴熷崟鎹垚鍔燂紒";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
//鍙嶅叧闂�
public bool CancelClose(Int64 lngBillKey, ref string sReturn)
{
@@ -96,6 +137,44 @@
catch (Exception e)
{
sReturn = e.Message;
+ throw (e);
+ }
+ }
+ //鍙嶅叧闂崟鎹�(鍖呭惈鍐欏叆鏃ュ織) 2024-01-31
+ public bool CancelClose(Int64 lngBillKey, string HBillNo, string sUser, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ DataSet ds = oCn.RunProcReturn("select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString(), MvarItemKey);
+ if (ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=4 Where HInterID=" + lngBillKey.ToString());
+ }
+ else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
+ }
+ else
+ {
+ oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='',HCloseDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
+ }
+
+ //鍐欏叆鏃ュ織
+ string WorkList = "鍙嶅叧闂崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','鍙嶅叧闂�')"
+ );
+
+ sReturn = "鍙嶅叧闂崟鎹垚鍔燂紒";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
throw (e);
}
}
@@ -132,7 +211,7 @@
throw (e);
}
}
- //鍙嶅鏍�(鍖呭惈鍙嶅鏍稿悗鎺у埗)
+ //鍙嶅鏍�(鍖呭惈鍙嶅鏍稿悗鎺у埗銆佸啓鍏ユ棩蹇�) 2024-01-31
public bool AbandonCheck(Int64 lngBillKey, string HBillNo, string procName, string sUser, ref string sReturn)
{
string sql = "";
@@ -176,8 +255,14 @@
oCn.RollBack();
return false;
}
+ //鍐欏叆鏃ュ織
+ string WorkList = "鍙嶅鏍稿崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','鍙嶅鏍�')"
+ );
- sReturn = "";
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔燂紒";
oCn.Commit();
return true;
}
@@ -225,7 +310,7 @@
throw (e);
}
}
- //瀹℃牳(鍖呭惈瀹℃牳鍚庢帶鍒�)
+ //瀹℃牳(鍖呭惈瀹℃牳鍚庢帶鍒躲�佸啓鍏ユ棩蹇�) 2024-01-31
public bool CheckBill(Int64 lngBillKey, string HBillNo,string procName , string sUser, ref string sReturn)
{
string sql = "";
@@ -256,8 +341,14 @@
oCn.RollBack();
return false;
}
+ //鍐欏叆鏃ュ織
+ string WorkList = "瀹℃牳鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','"+SystemName+"','" + IPAddress + "','瀹℃牳')"
+ );
- sReturn = "";
+ sReturn = "瀹℃牳鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -286,21 +377,31 @@
throw (e);
}
}
- //鍏抽棴
- public bool CloseBill(Int64 lngBillKey, string sUser, ref string sReturn)
+ //鍏抽棴鍗曟嵁(鍖呭惈鍐欏叆鏃ュ織) 2024-01-31
+ public bool CloseBill(Int64 lngBillKey, string HBillNo, string sUser, ref string sReturn)
{
-
try
{
+ oCn.BeginTran();
string HCloseMan = sUser;
string HCloseDate = ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='" + HCloseMan + "',HCloseDate='" + HCloseDate + "' Where HInterID=" + lngBillKey.ToString());
- sReturn = "";
+ oCn.RunProc(" Update " + MvarItemKey + " set HCloseMan='" + HCloseMan + "',HCloseDate='" + HCloseDate + "',HBillStatus=3 Where HInterID=" + lngBillKey.ToString());
+
+ //鍐欏叆鏃ュ織
+ string WorkList = "鍏抽棴鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','鍏抽棴')"
+ );
+
+ sReturn = "鍏抽棴鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
return true;
}
catch (Exception e)
{
sReturn = e.Message;
+ oCn.RollBack();
throw (e);
}
}
@@ -322,20 +423,31 @@
}
}
- //浣滃簾
- public bool Cancelltion(Int64 lngBillKey,string sUser, ref string sReturn)
+ //浣滃簾鍗曟嵁(鍖呭惈鍐欏叆鏃ュ織) 2024-01-31
+ public bool Cancelltion(Int64 lngBillKey, string HBillNo, string sUser, ref string sReturn)
{
try
{
+ oCn.BeginTran();
string HDeleteMan = sUser;
string HDeleteDate = ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='" + HDeleteMan + "',HDeleteDate='" + HDeleteDate + "' Where HInterID=" + lngBillKey.ToString());
- sReturn = "";
+ oCn.RunProc(" Update " + MvarItemKey + " set HDeleteMan='" + HDeleteMan + "',HDeleteDate='" + HDeleteDate + "',HBillStatus=4 Where HInterID=" + lngBillKey.ToString());
+
+ //鍐欏叆鏃ュ織
+ string WorkList = "浣滃簾鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','浣滃簾')"
+ );
+
+ sReturn = "浣滃簾鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
return true;
}
catch (Exception e)
{
sReturn = e.Message;
+ oCn.RollBack();
throw (e);
}
}
@@ -399,10 +511,11 @@
throw (e);
}
}
-
- //鍒犻櫎鍗曟嵁
- public virtual bool DeleteBill(Int64 lngBillKey, string HBillNo, string procName, string user, ref string sReturn)
+ //鍒犻櫎鍗曟嵁(鍖呭惈鍒犻櫎鍚庢帶鍒躲�佸啓鍏ユ棩蹇�) 2024-01-31
+ public bool DeleteBill(Int64 lngBillKey, string HBillNo, string procName, string sUser, ref string sReturn)
{
+ string sql = "";
+ DataSet ds;
try
{
oCn.BeginTran();
@@ -416,24 +529,27 @@
//鍒犻櫎涓昏〃
DeleteBillMain(lngBillKey);
-
- //鍒犻櫎鍚庢帶鍒�==================================================================================
- string sql2 = "exec " + procName + " " + lngBillKey + ",'" + HBillNo + "','" + user + "'";
- DataSet ds = oCn.RunProcReturn(sql2, procName);
+ //鍒犻櫎鍚庢帶鍒�
+ sql = "exec " + procName + " " + lngBillKey + ",'" + HBillNo + "','" + sUser + "'";
+ ds = oCn.RunProcReturn(sql, procName);
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
-
- sReturn = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ sReturn = "鍒犻櫎杩囩▼涓嚭閿欙紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
oCn.RollBack();
return false;
}
if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
{
- sReturn = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
oCn.RollBack();
return false;
}
- //==============================================================================================
+ //鍐欏叆鏃ュ織
+ string WorkList = "鍒犻櫎鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','鍒犻櫎')"
+ );
sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
oCn.Commit();
--
Gitblit v1.9.1