From 9dd3335301f79d7462bf4acb41ba6456cd6e74e1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 31 八月 2023 10:46:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
index f2b911d..a0b3b11 100644
--- a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
+++ b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -14,7 +14,7 @@
public ClsOA_ErrMsgBackBill()
{
base.MvarItemKeySub = "OA_ErrMsgBackBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub2 = "OA_ErrMsgBackBillSub2";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey="OA_ErrMsgBackBillMain";
@@ -70,6 +70,7 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
@@ -88,12 +89,10 @@
foreach (Models.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
{
oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
- " (HInterID,HEntryID" +
- ",HReceiveMan,HReadFlag" +
+ " (HInterID,HEntryID,HReceiveMan,HReadFlag" +
")" +
" values("
- + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
- ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
") ");
}
@@ -192,6 +191,37 @@
throw (e);
}
}
+
+ //鍒犻櫎鍗曟嵁
+ public virtual bool DeleteBill(Int64 lngBillKey,string HEntryID, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select * from "+MvarItemKeySub+ " where HInterID=" + lngBillKey.ToString() + " and HEntryID='" + HEntryID + "'");
+ var dataSet = oCN.RunProcReturn(sql, ""+ MvarItemKeySub + "");
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎鏄庣粏琛�
+ oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString()+" and HEntryID='"+HEntryID+"'");
+ //鍒犻櫎涓昏〃
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ {
+ DeleteBillMain(lngBillKey);
+ }
+ sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
--
Gitblit v1.9.1