From 1bf3dc43e38f780864b7030f2a8aca8bf01abc05 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 01 八月 2024 17:10:02 +0800
Subject: [PATCH] 1
---
DAL/销售管理/ClsXs_ReceivableBill.cs | 151 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 147 insertions(+), 4 deletions(-)
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
index d087237..720f417 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_ReceivableBill.cs"
@@ -9,11 +9,11 @@
{
public Model.ClsXs_ReceivableBillMain omodel = new Model.ClsXs_ReceivableBillMain();
public List<Model.ClsXs_ReceivableBillSub> DetailColl = new List<Model.ClsXs_ReceivableBillSub>();
-
+ public List<Model.ClsXs_ReceivableBillSub> DetailCol2 = new List<Model.ClsXs_ReceivableBillSub>();//瀛愯〃浜�
public ClsXs_ReceivableBill()
{
base.MvarItemKeySub = "Xs_ReceivableBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub2 = "Xs_ReceivableBillSub_Entry";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey= "Xs_ReceivableBillMain";
@@ -115,6 +115,7 @@
",HExplanation = '" + omodel.HExplanation + "'" +
",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
",HRemark = '" + omodel.HRemark + "'" +
+ ",HPriceType = '" + omodel.HPriceType + "'" +
" where HInterID = " + omodel.HInterID;
oCn.RunProc(mainSql);
@@ -122,7 +123,8 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
-
+ //鍒犻櫎瀛愯〃2
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
//鎻掑叆瀛愯〃
@@ -172,6 +174,51 @@
//鏇存柊璁㈠崟鍏宠仈鏁伴噺
AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎻掑叆瀛愯〃Entry
+ foreach (Model.ClsXs_ReceivableBillSub oSub in DetailCol2)
+ {
+ string subSql = "insert into Xs_ReceivableBillSub_Entry" +
+ "(HInterID,HEntryID,HBillNo_bak,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney" +
+ ",HlineTotal,HlineTotalBB,HMoney,HMoneyBB,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ ",HSeOrderTaxPrice,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo) " +
+ " values(" +
+ "" + omodel.HInterID + "" +
+ "," + oSub.HEntryID + "" +
+ ",'" + omodel.HBillNo + "'" +
+ "," + oSub.HMaterID + "" +
+ "," + oSub.HUnitID + "" +
+ "," + oSub.HQty + "" +
+ "," + oSub.HPrice + "" +
+ "," + oSub.HTaxPrice + "" +
+ "," + oSub.HDiscountRate + "" +
+ "," + oSub.HRelTaxPrice + "" +
+ "," + oSub.HTaxRate + "" +
+ "," + oSub.HTaxMoney + "" +
+ "," + oSub.HlineTotal + "" +
+ "," + oSub.HlineTotalBB + "" +
+ "," + oSub.HMoney + "" +
+ "," + oSub.HMoneyBB + "" +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID + "" +
+ "," + oSub.HSourceEntryID + "" +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty + "" +
+ "," + oSub.HRelationMoney + "" +
+ "," + oSub.HPOOrderInterID + "" +
+ "," + oSub.HPOOrderEntryID + "" +
+ ",'" + oSub.HPOOrderBillNo + "'" +
+ "," + oSub.HSeOrderTaxPrice + "" +
+ "," + oSub.HSeOrderInterID + "" +
+ "," + oSub.HSeOrderEntryID + "" +
+ ",'" + oSub.HSeOrderBillNo + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+
+
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -213,7 +260,7 @@
string mainSql = "insert into Xs_ReceivableBillMain" +
"(HInterID,HBillNo,HDate,HYear,HPeriod,HBillType,HBillSubType" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
- ",HMaker,HMakeDate,HSSID,HSellSID,HReceiveDate,HCusID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark) " +
+ ",HMaker,HMakeDate,HSSID,HSellSID,HReceiveDate,HCusID,HCurID,HExRate,HEmpID,HMangerID,HDeptID,HExplanation,HInnerBillNo,HRemark,HPriceType) " +
"values(" +
"" + omodel.HInterID + "" +
",'" + omodel.HBillNo + "'" +
@@ -240,6 +287,7 @@
",'" + omodel.HExplanation + "'" +
",'" + omodel.HInnerBillNo + "'" +
",'" + omodel.HRemark + "'" +
+ ",'" + omodel.HPriceType + "'" +
")";
oCn.RunProc(mainSql);
@@ -290,6 +338,50 @@
//鏇存柊璁㈠崟鍏宠仈鏁伴噺
AddNewRelation(ref sReturn, omodel.HInterID);
+
+ //鎻掑叆瀛愯〃Entry
+ foreach (Model.ClsXs_ReceivableBillSub oSub in DetailCol2)
+ {
+ string subSql = "insert into Xs_ReceivableBillSub_Entry" +
+ "(HInterID,HEntryID,HBillNo_bak,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney" +
+ ",HlineTotal,HlineTotalBB,HMoney,HMoneyBB,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ ",HSeOrderTaxPrice,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo) " +
+ " values(" +
+ "" + omodel.HInterID + "" +
+ "," + oSub.HEntryID + "" +
+ ",'" + omodel.HBillNo + "'" +
+ "," + oSub.HMaterID + "" +
+ "," + oSub.HUnitID + "" +
+ "," + oSub.HQty + "" +
+ "," + oSub.HPrice + "" +
+ "," + oSub.HTaxPrice + "" +
+ "," + oSub.HDiscountRate + "" +
+ "," + oSub.HRelTaxPrice + "" +
+ "," + oSub.HTaxRate + "" +
+ "," + oSub.HTaxMoney + "" +
+ "," + oSub.HlineTotal + "" +
+ "," + oSub.HlineTotalBB + "" +
+ "," + oSub.HMoney + "" +
+ "," + oSub.HMoneyBB + "" +
+ ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID + "" +
+ "," + oSub.HSourceEntryID + "" +
+ ",'" + oSub.HSourceBillNo + "'" +
+ ",'" + oSub.HSourceBillType + "'" +
+ "," + oSub.HRelationQty + "" +
+ "," + oSub.HRelationMoney + "" +
+ "," + oSub.HPOOrderInterID + "" +
+ "," + oSub.HPOOrderEntryID + "" +
+ ",'" + oSub.HPOOrderBillNo + "'" +
+ "," + oSub.HSeOrderTaxPrice + "" +
+ "," + oSub.HSeOrderInterID + "" +
+ "," + oSub.HSeOrderEntryID + "" +
+ ",'" + oSub.HSeOrderBillNo + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -423,6 +515,57 @@
DetailColl.Add(oSub);
}
+
+ //寰幆
+ DataSet DsSub2;
+ DsSub2 = oCn.RunProcReturn("select * from Xs_ReceivableBillSub_Entry where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Xs_ReceivableBillSub_Entry");
+ DetailCol2.Clear();//娓呯┖
+ for (int i = 0; i < DsSub2.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsXs_ReceivableBillSub oSub = new Model.ClsXs_ReceivableBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HBillNo_bak"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub2.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub2.Tables[0].Rows[i]["HEntryCloseDate"]);
+
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub2.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub2.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[i]["HRelationMoney"]);
+
+ oSub.HRemark = DsSub2.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HPrice"]);
+ oSub.HTaxPrice = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HTaxPrice"]);
+ oSub.HDiscountRate = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HDiscountRate"]);
+ oSub.HRelTaxPrice = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HRelTaxPrice"]);
+ oSub.HTaxRate = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HTaxRate"]);
+ oSub.HTaxMoney = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HTaxMoney"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HMoney"]);
+ oSub.HMoneyBB = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HMoneyBB"]);
+ oSub.HlineTotal = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HlineTotal"]);
+ oSub.HlineTotalBB = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HlineTotalBB"]);
+
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[0]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[0]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[0]["HPOOrderBillNo"]);
+
+ oSub.HSeOrderTaxPrice = DBUtility.ClsPub.isDoule(DsSub2.Tables[0].Rows[0]["HSeOrderTaxPrice"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[0]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub2.Tables[0].Rows[0]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub2.Tables[0].Rows[0]["HSeOrderBillNo"]);
+
+ DetailCol2.Add(oSub);
+ }
+
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
return true;
}
--
Gitblit v1.9.1