From e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 05 十一月 2021 15:46:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsPay_SingleBalBill.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/WebAPI/DLL/ClsPay_SingleBalBill.cs b/WebAPI/DLL/ClsPay_SingleBalBill.cs
index fb55e1a..11c293c 100644
--- a/WebAPI/DLL/ClsPay_SingleBalBill.cs
+++ b/WebAPI/DLL/ClsPay_SingleBalBill.cs
@@ -5,7 +5,7 @@
namespace DAL
{
- public class ClsPay_SingleBalBill:DBUtility.ClsXt_BaseBill
+ public class ClsPay_SingleBalBill : DBUtility.ClsXt_BaseBill
{
public Model.ClsPay_SingleBalBillMain omodel = new Model.ClsPay_SingleBalBillMain();
public List<Model.ClsPay_SingleBalBillSub> DetailColl = new List<Model.ClsPay_SingleBalBillSub>();
@@ -16,9 +16,9 @@
base.MvarItemKeySub2 = "Pay_SingleBalBillKS_HeaderText";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
- base.MvarItemKey="Pay_SingleBalBillMain";
- base.MvarReportTitle="宸ヨ祫缁撶畻鍗曪紙鍗曚汉锛�";
- base.BillType="2205";
+ base.MvarItemKey = "Pay_SingleBalBillMain";
+ base.MvarReportTitle = "宸ヨ祫缁撶畻鍗曪紙鍗曚汉锛�";
+ base.BillType = "2205";
base.HBillSubType = "2205";
}
@@ -29,7 +29,7 @@
{
DetailColl = null;
}
-
+
#endregion 鑷畾涔夋柟娉�
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
@@ -120,8 +120,8 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HSaveFlag" +
",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + Convert.ToString(omodel.HSaveFlag ? 1 : 0) +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + Convert.ToString(omodel.HSaveFlag ? 1 : 0) +
", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
") ");
//鎻掑叆瀛愯〃
@@ -176,9 +176,9 @@
try
{
//鏌ヨ涓昏〃
- DataSet Ds ;
+ DataSet Ds;
Ds = oCn.RunProcReturn("Select * from Pay_SingleBalBillMain Where HInterID=" + lngBillKey.ToString(), "Pay_SingleBalBillMain");
- if(Ds.Tables[0].Rows.Count==0)
+ if (Ds.Tables[0].Rows.Count == 0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
return false;
@@ -217,9 +217,9 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
//
-
+
//寰幆
- DataSet DsSub ;
+ DataSet DsSub;
DsSub = oCn.RunProcReturn("Select * from Pay_SingleBalBillSub Where HInterID=" + lngBillKey.ToString() + "order by HEntryID", "Pay_SingleBalBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
@@ -233,8 +233,8 @@
oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
@@ -282,8 +282,8 @@
throw (e);
}
}
-
-
+
+
}
}
--
Gitblit v1.9.1