From 17be11c6c4be17c9944004a99551ebe6159a12ba Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期一, 26 二月 2024 09:59:51 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
index f63d04c..75d10cd 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
@@ -1083,7 +1083,7 @@
BillOld.MvarItemKey = "PM_WorkTaskBillMain";
oCN.BeginTran();//寮�濮嬩簨鍔�
- //Type 0 寮�濮嬩换鍔� 1 鎾ら攢浠诲姟
+ //Type 0 寮�濮嬩换鍔� 1 鎾ら攢浠诲姟 2缁撴潫浠诲姟
if (Type == 0)
{
//鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
@@ -1100,8 +1100,20 @@
}
if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
{
- string sql1= "update PM_WorkTaskBillMain set HTaskStatus='杩涜涓�' where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMainSourceBillType"])== "4759")
+ {
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
+ string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + HInterID;
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
+ }
+ else
+ {
+ string sql2 = "update PM_WorkTaskBillMain set HTaskStatus='宸插紑濮�' where HinterID = " + HInterID;
+ oCN.RunProc(sql2);
+ }
+
}
}
@@ -1121,31 +1133,13 @@
}
if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
{
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='鏈紑濮�' where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='鏈紑濮�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
}
}
- else if (Type == 2)
- {
- //鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
- DataSet ds;
- string sql = "select * from PM_WorkTaskBillMain where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
- {
- string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='宸茬粨鏉�' where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
- }
- }
-
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
@@ -1157,6 +1151,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
@@ -1530,6 +1525,30 @@
string HSourceBillType = oSub.HSourceBillType;
bool HFinishFlag = oSub.HFinishFlag;
+ if (HFinishFlag==true)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁瀛樺湪
+ DataSet ds;
+ string sqls = "select * from PM_WorkTaskBillMain where HinterID = " + HSourceInterID;
+ ds = oCN.RunProcReturn(sqls, "PM_WorkTaskBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
+ string sql1 = "update PM_WorkTaskBillMain set HTaskStatus='宸插畬鎴�' where HinterID = " + HSourceInterID;
+ oCN.RunProc(sql1);
+ string sql2 = "update PM_CustomerTaskBillMain set HTaskStatus='宸插畬鎴�' where HinterID = " + lInterID;
+ oCN.RunProc(sql2);
+ }
+ }
+
string sql = "insert into PM_WorkTaskReportBillSub" +
"(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
"values(" +
--
Gitblit v1.9.1