From 76ffaf6c0b670ca779523ff22fbfb536bb45bf71 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 08:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
index 3fb5c9d..7a2c41f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
@@ -81,7 +81,8 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
+ //ds = oCN.RunProcReturn("select * from h_v_IF_RepairCheckList where HitemID=" + HInterID, "h_v_IF_RepairCheckList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_IF_RepairCheckList WHERE HitemID=" + HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_IF_RepairCheckList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_IF_RepairCheckList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -118,11 +119,11 @@
[HttpGet]
public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
{
- DAL.ClsGy_RepairType_Ctl oDept = new DAL.ClsGy_RepairType_Ctl();
- DAL.ClsGy_RepairType_View oDeptHlp = new DAL.ClsGy_RepairType_View();
+ DAL.ClsGy_RepairCheck_Ctl oDept = new DAL.ClsGy_RepairCheck_Ctl();
+ DAL.ClsGy_RepairCheck_View oDeptHlp = new DAL.ClsGy_RepairCheck_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -221,7 +222,7 @@
List<MaintenanceAcceptItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceAcceptItem>>(msg1);
- long HItemID = list[0].HItemID;
+ long HItemID = list[0].HItemID.ToString()==""?0: list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -249,10 +250,13 @@
oCN.RunProc("Insert Into Gy_RepairCheck " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark) " +
- " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','0'" +
+ " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','"+ HItemID + "'" +
",'1',0,'" + HStopflag + "','" + HRemark + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_RepairCheck set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_RepairCheck set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -294,6 +298,7 @@
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
string msg5 = sArray[3].ToString();
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<MaintenanceAcceptItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceAcceptItem>>(msg2);
@@ -302,7 +307,7 @@
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
+ long HParentID =list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
@@ -310,7 +315,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -347,10 +352,8 @@
",HName='" + HName + "'" +
",HShortNumber='" + HShortNumber + "'" +
",HHelpCode='" + HHelpCode + "'" +
- ",HLevel='1'" +
",HParentID=" + HParentID +
- ",HEndflag='0'"+
- ",HStopflag=" + HStopflag +
+ ",HStopflag='" + HStopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1