From 6628d9bda9d34a7f611b951c931f7a465ee20c6d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 一月 2024 10:30:47 +0800
Subject: [PATCH] 用户关联用户查询 删除
---
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 19 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 fb58736..b0f8ee3 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"
@@ -995,6 +995,7 @@
public class PM_WorkTaskReportBill_Sub
{
public int RowID;
+ public int HProjectID;
public string HProNumber;
public int HProjectStageID;
public string HProjectStageName;
@@ -1009,9 +1010,10 @@
public int HSourceEntryID;
public string HSourceBillNo;
public string HSourceBillType;
+ public bool HFinishFlag;
}
#endregion
- #region 椤圭洰闃舵娓呭崟 鏂板/缂栬緫-淇濆瓨
+ #region 浠诲姟姹囨姤 鏂板/缂栬緫-淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -1045,7 +1047,7 @@
return objJsonResult;
}
#endregion
- #region 娣诲姞 椤圭洰闃舵娓呭崟 涓昏〃
+ #region 娣诲姞 浠诲姟姹囨姤 涓昏〃
public json AddBillMain_WorkTaskReportBill(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1107,16 +1109,23 @@
string HUpdater = mainList[0].HUpdater;
string HUpdaterDate = mainList[0].HUpdaterDate;
-
-
- if (OperationType == 2)
+ //淇濆瓨鍓嶆帶鍒�
+ DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_PM_WorkTaskReportBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_PM_WorkTaskReportBill_BeforeSaveCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
{
- ds = oCN.RunProcReturn("select * from PM_WorkTaskReportBillMain where HBillNo ='" + HBillNo + "'", "PM_WorkTaskReportBillMain");
- if (ds.Tables[0].Rows.Count > 0)
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙烽噸澶�,璇烽噸鏂拌緭鍏�!";
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -1168,6 +1177,8 @@
oCN.RunProc(sql);
+ //鍒犻櫎瀛愯〃鏃� 鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
//璁板綍鏃ュ織
@@ -1230,7 +1241,7 @@
}
}
#endregion
- #region 娣诲姞椤圭洰闃舵娓呭崟 瀛愯〃
+ #region 娣诲姞浠诲姟姹囨姤 瀛愯〃
public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
{
List<PM_WorkTaskReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_WorkTaskReportBill_Sub>>(msg3);
@@ -1240,6 +1251,7 @@
i++; //鍚屼竴涓富琛ㄤ笅鐨勫瓙琛ㄧ殑鍐呯爜鑷
int HEntryID = i;
+ int HProjectID = oSub.HProjectID;
string HProNumber = oSub.HProNumber;
int HProjectStageID = oSub.HProjectStageID;
string HName = oSub.HName;
@@ -1253,16 +1265,17 @@
int HSourceEntryID = oSub.HSourceEntryID;
string HSourceBillNo = oSub.HSourceBillNo;
string HSourceBillType = oSub.HSourceBillType;
-
+ bool HFinishFlag = oSub.HFinishFlag;
string sql = "insert into PM_WorkTaskReportBillSub" +
- "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
+ "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
"values(" +
"" + HInterID +
",'" + HBillNo +
"'," + HEntryID +
",'" + HRemark +
- "','" + HProNumber +
+ "'," + HProjectID +
+ ",'" + HProNumber +
"'," + HProjectStageID +
",'" + HName +
"','" + HTaskNote +
@@ -1274,16 +1287,44 @@
"," + HSourceEntryID +
",'" + HSourceBillType +
"','" + HSourceBillNo +
- "')";
+ "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
+ ")";
oCN.RunProc(sql);
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
+ //淇濆瓨鍚庢帶鍒�
+ DataSet AfterDs = oCN.RunProcReturn("Exec h_p_PM_WorkTaskReportBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_PM_WorkTaskReportBill_AfterSaveCtrl");
+ if (AfterDs == null || AfterDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(AfterDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(AfterDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
#endregion
#endregion
@@ -1433,6 +1474,8 @@
oCN.BeginTran();
+ //鍒犻櫎瀛愯〃鏃� 鍥炲～宸ヤ綔浠诲姟鍗曞叧鑱旀暟閲忋�佸崟鎹姸鎬�
+ oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
oCN.RunProc("delete from PM_WorkTaskReportBillMain where HInterID = " + HInterID);
oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
@@ -1440,7 +1483,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1