From 9f0de6516834484c5308f81a4a2b14fa1b139bec Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 08 八月 2024 17:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DBUtility/业务单据/ClsXt_BaseBill.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 e0c2dd0..c132dcc 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"
@@ -373,7 +373,7 @@
}
//鍙戣捣澶氱骇瀹℃壒
- public bool startCheckFlow(Int64 lngBillKey, Int64 HCheckFlowID_select, ref string sReturn)
+ public bool startCheckFlow(Int64 lngBillKey,ref string sReturn)
{
try
{
@@ -400,7 +400,7 @@
return false;
}
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 " +
@@ -475,21 +475,21 @@
oCn.BeginTran();
//鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
- string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "' and ISNULL(HChecker,'') <> ''";
- DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
- if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
- {
- sReturn = "鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛�";
- return false;
- }
+ //string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "' and ISNULL(HChecker,'') <> ''";
+ //DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ //if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ //{
+ // sReturn = "鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛�";
+ // return false;
+ //}
//鑾峰彇闇�瑕侀┏鍥炵殑瀹℃牳椤圭洰
- sql0 = "select c.* from Xt_CheckFlowMain as a " +
+ string sql0 = "select c.* from Xt_CheckFlowMain as a " +
"inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
"inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
"where c.HBillTypeID = '" + this.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
"order by b.HFlowNo asc";
- ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
{
sReturn = "椹冲洖澶辫触!鍘熷洜:鏈彂璧峰鎵癸紒锛�";
@@ -511,7 +511,7 @@
//鏇存柊 椹冲洖鍒犻櫎瀹℃牳娴佺姸鎬佽〃
string sql02 = "Delete Xt_BillCheckFlowStatus where HBillTypeID = '" + this.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID;
oCn.RunProc(sql02);
- oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=5 Where HInterID=" + lngBillKey.ToString());
+ oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=5,HCheckItemNowID = 0,HCheckItemNextID = 0 Where HInterID=" + lngBillKey.ToString());
//鍐欏叆鏃ュ織
string WorkList = "椹冲洖鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
--
Gitblit v1.9.1