From f7b16dcb508ba577ea7bb62a888ff6500bfea945 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 28 二月 2026 13:30:24 +0800
Subject: [PATCH] 1
---
DBUtility/业务单据/ClsXt_BaseBill.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index b805e7c..5b49294 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -520,19 +520,40 @@
}
HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
string HCheckFlowID_select = ds.Tables[0].Rows[0]["HCheckFlowID"].ToString();
- //鑾峰彇鍗曟嵁绫诲瀷瀵瑰簲鐨勯粯璁ゅ鎵规祦
- string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
- "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
- "where a.HBillTypeID = '" + this.BillType + "' " +
- //"and a.HInterID = " + HCheckFlowID_select + " " +
- "and a.HStandard = 1 " +
- "order by b.HFlowNo asc";
- DataSet ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
- if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ //鑻ュ崟鎹湭缁戝畾瀹℃壒娴�
+ DataSet ds1;
+ if(HCheckFlowID_select=="0")
{
- sReturn = "榛樿瀹℃壒娴佷笉瀛樺湪锛�";
- return false;
+ //鑾峰彇鍗曟嵁绫诲瀷瀵瑰簲鐨勯粯璁ゅ鎵规祦
+ string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "where a.HBillTypeID = '" + this.BillType + "' " +
+ //"and a.HInterID = " + HCheckFlowID_select + " " +
+ "and a.HStandard = 1 " +
+ "order by b.HFlowNo asc";
+ ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈粦瀹氬鎵规祦涓旈粯璁ゅ鎵规祦涓嶅瓨鍦紒";
+ return false;
+ }
}
+ else
+ {
+ //鑾峰彇鍗曟嵁瀵瑰簲鐨勫鎵规祦
+ string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "where a.HBillTypeID = '" + this.BillType + "' " +
+ "and a.HInterID = " + HCheckFlowID_select + " " +
+ "order by b.HFlowNo asc";
+ ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "瀹℃壒娴佷笉瀛樺湪锛�";
+ return false;
+ }
+ }
+
HCheckFlowID = ds1.Tables[0].Rows[0]["HInterID"].ToString();
HCheckItemNowID = ds1.Tables[0].Rows[0]["HCheckItemID"].ToString();
@@ -582,7 +603,7 @@
}
//椹冲洖
- public bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo,string sUser, ref string sReturn)
+ public virtual bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo,string sUser, ref string sReturn)
{
if (isUse(lngBillKey, ref sReturn))
@@ -623,7 +644,7 @@
//鏌ユ壘鏄惁鏈夋潈闄�
string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + sUser + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
DataSet ds01 = oCn.RunProcReturn(sql01, "Xt_CheckUserRight");
- if (ds01.Tables[0].Rows.Count == 0)
+ if (ds01.Tables[0].Rows.Count == 0)//鍗曟嵁鍘熷鏍告潈闄愪负澶氱骇瀹℃牳椹冲洖鏉冮檺
{
sReturn = "鏃犳潈闄愶紒";
return false;
@@ -1579,7 +1600,18 @@
{
return true;
}
-
+
+ //淇敼鍗曟嵁_APP
+ public virtual bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ return true;
+ }
+
+ //鏂板鍗曟嵁_APP
+ public virtual bool AddBill_APP(ref string sReturn)
+ {
+ return true;
+ }
//鍒犻櫎鍏宠仈
public virtual void DeleteRelation(ref string sReturn, Int64 lngBillKey)
--
Gitblit v1.9.1