From 493c053a3fbc2db47c46ca46944ed911de84b0a9 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 26 十月 2023 13:19:18 +0800
Subject: [PATCH] 应付收款单
---
DAL/应收管理/ClsYS_ReceiveBackBill.cs | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
index 77dbe6a..7986037 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBill.cs"
@@ -41,7 +41,8 @@
//
oCn.BeginTran();
//鏇存柊涓昏〃
- oCn.RunProc("UpDate YS_ReceiveBillMain set " +
+ string mainSql =
+ "UpDate YS_ReceiveBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -49,7 +50,7 @@
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
- //========================================
+ //========================================
",HAccDate='" + omodel.HAccDate + "'" +
",HCusID=" + omodel.HCusID.ToString() +
",HAccCusID=" + omodel.HAccCusID.ToString() +
@@ -58,6 +59,8 @@
",HExRate=" + omodel.HExRate.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID +
+ ",HOrgID=" + omodel.HOrgID +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HBankID=" + omodel.HBankID.ToString() +
",HBankNo='" + omodel.HBankNo + "'" +
@@ -68,12 +71,13 @@
",HRemainMoney=" + omodel.HRemainMoney.ToString() +
",HCheckStatus=" + omodel.HCheckStatus.ToString() +
- ",HSSNum='" + omodel.HSSNum.ToString() +
+ ",HSSNum='" + omodel.HSSNum.ToString() + "'" +
",HRelSumMoney=" + omodel.HRelSumMoney.ToString() +
",HSumMoneyBB=" + omodel.HSumMoneyBB.ToString() +
",HRelSumMoneyBB=" + omodel.HRelSumMoneyBB.ToString() +
",HDiscountRate=" + omodel.HDiscountRate.ToString() +
- " where HInterID=" + lngBillKey.ToString());
+ " where HInterID=" + lngBillKey.ToString();
+ oCn.RunProc(mainSql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -129,25 +133,32 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ while(IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
oCn.BeginTran();
- //涓昏〃
- oCn.RunProc("Insert Into YS_ReceiveBillMain " +
+ string mainSql = "Insert Into YS_ReceiveBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HAccDate,HCusID,HAccCusID,HSSID,HCurID,HExRate" +
- ",HDeptID,HEmpID,HSumMoney,HBankID,HBankNo,HExplanation" +
+ ",HDeptID,HEmpID,HManagerID,HOrgID,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 + "'" +
+ " 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.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() +
- ") ");
+ ", " + 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() +
+ ") ";
+
+ //涓昏〃
+ oCn.RunProc(mainSql);
//鎻掑叆瀛愯〃
foreach (Model.ClsYS_ReceiveBackBillSub oSub in DetailColl)
{
@@ -241,6 +252,8 @@
omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
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.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