From b9de96ab398fca5f3351df75a7320f2d1871e7e4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 28 三月 2024 13:23:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/应收管理/ClsYS_ReceiveBill.cs | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 insertions(+), 7 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 79952d1..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)
//{
@@ -142,23 +177,80 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ 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();
//涓昏〃
string mainSql = "Insert Into YS_ReceiveBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",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" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ",'" + omodel.HAccDate + "'," + omodel.HCusID.ToString() + "," + omodel.HAccCusID.ToString() + "," + omodel.HSSID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
- ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation + "'" +
- ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() +
- ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() +
+ " values(" +
+ "'" + this.BillType + "'" +
+ ",'" + this.HBillSubType + "'" +
+ "," + omodel.HInterID.ToString() + "" +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "" +
+ "," + omodel.HPeriod.ToString() + "" +
+ ",'" + omodel.HRemark + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "'" +
+ ",getdate()" + "";
+
+ mainSql +=
+ "," + omodel.HMainSourceInterID + "";
+ mainSql +=
+ "," + omodel.HMainSourceEntryID + "";
+ mainSql +=
+ ",'" + (omodel.HMainSourceBillNo ==null?"":omodel.HMainSourceBillNo) + "'";
+ mainSql +=
+ ",'" + (omodel.HMainSourceBillType) + "'";
+
+ mainSql +=
+ ",'" + omodel.HAccDate + "'" +
+ "," + omodel.HCusID.ToString() + "" +
+ "," + omodel.HAccCusID.ToString() + "" +
+ "," + omodel.HSSID.ToString() + "" +
+ "," + omodel.HCurID.ToString() + "" +
+ "," + omodel.HExRate.ToString() +
+ ", " + omodel.HDeptID.ToString() + "" +
+ "," + omodel.HEmpID.ToString() + "" +
+ "," + omodel.HManagerID + "" +
+ "," + omodel.HOrgID + "" +
+ "," + omodel.HGiftRate + "" +
+ "," + omodel.HGiftMoney + "" +
+ "," + omodel.HSumMoney.ToString() + "" +
+ "," + omodel.HBankID.ToString() + "" +
+ ",'" + omodel.HBankNo + "'" +
+ ",'" + omodel.HExplanation + "'" +
+ ",'" + omodel.HSSNum + "'" +
+ "," + omodel.HDiscountRate.ToString() + "" +
+ "," + omodel.HRelSumMoney.ToString() + "" +
+ "," + omodel.HSumMoneyBB.ToString() + "" +
+ "," + omodel.HRelSumMoneyBB.ToString() +
+ ",'" + omodel.HInnerBillNo + "'" +
+ "," + omodel.HCheckMoney.ToString() + "" +
+ "," + omodel.HCheckMoneyFor.ToString() + "" +
+ "," + omodel.HRemainMoney.ToString() + "" +
+ "," + omodel.HCheckStatus.ToString() +
") ";
oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
@@ -183,6 +275,23 @@
") ";
oCn.RunProc(subSql);
}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ 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)
//{
@@ -246,6 +355,12 @@
omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+
+ omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
+ omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+
//========================================================
omodel.HAccDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAccDate"]);
omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
@@ -257,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