From 7e2f454e262574b99a0a0f7b523bab382d44f4f8 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 02 六月 2021 08:33:54 +0800
Subject: [PATCH] 增加 维修验收项目(新增,修改,删除)及列表,优化树型

---
 WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
index 3fb5c9d..eaf0ba1 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceAcceptItemController.cs
@@ -118,8 +118,8 @@
         [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))
@@ -221,7 +221,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 +249,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 + "')");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
-                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 +297,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 +306,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;
@@ -347,10 +351,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