From 7659bbba43cb690164bbf1fa3bc1d0fe74d883c9 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 八月 2024 17:04:05 +0800
Subject: [PATCH] 1
---
DAL/应收管理/ClsYS_ReceiveBill.cs | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
index 8dc9d9f..4d3ea04 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
@@ -38,6 +38,21 @@
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_YS_ReceiveBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_YS_ReceiveBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
//
oCn.BeginTran();
//鏇存柊涓昏〃
@@ -60,6 +75,8 @@
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID +
",HOrgID=" + omodel.HOrgID +
+ ",HGiftRate=" + omodel.HGiftRate +
+ ",HGiftMoney=" + omodel.HGiftMoney +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HBankID=" + omodel.HBankID.ToString() +
",HBankNo='" + omodel.HBankNo + "'" +
@@ -105,6 +122,24 @@
"," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
") ");
}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("h_p_YS_ReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_YS_ReceiveBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+
//
//foreach (Model.ClsYS_ReceiveBillSub oSub in DetailColl)
//{
@@ -164,7 +199,7 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HAccDate,HCusID,HAccCusID,HSSID,HCurID,HExRate" +
- ",HDeptID,HEmpID,HManagerID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
+ ",HDeptID,HEmpID,HManagerID,HOrgID,HGiftRate,HGiftMoney,HSumMoney,HBankID,HBankNo,HExplanation" +
",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus" +
") " +
@@ -200,6 +235,8 @@
"," + omodel.HEmpID.ToString() + "" +
"," + omodel.HManagerID + "" +
"," + omodel.HOrgID + "" +
+ "," + omodel.HGiftRate + "" +
+ "," + omodel.HGiftMoney + "" +
"," + omodel.HSumMoney.ToString() + "" +
"," + omodel.HBankID.ToString() + "" +
",'" + omodel.HBankNo + "'" +
@@ -335,6 +372,8 @@
omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+ omodel.HGiftRate = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HGiftRate"]);
+ omodel.HGiftMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HGiftMoney"]);
omodel.HSumMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HSumMoney"]);
omodel.HBankID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBankID"]);
omodel.HBankNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBankNo"]);
--
Gitblit v1.9.1