Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-12-28 2ffe77fe9f2f45660be629acb06de680f278303e

 WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs

@@ -31,11 +31,11 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from Gy_Repair  " + sWhere, "Gy_Repair");
                    ds = oCN.RunProcReturn("select HParentID ParentID, * from Gy_Repair" + sWhere, "Gy_Repair");
                }
                else
                {
                    string sql1 = "select * from Gy_Repair where 1 = 1 ";
                    string sql1 = "select HParentID ParentID,* from Gy_Repair where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_Repair");
                }
@@ -118,7 +118,7 @@
            
            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;
@@ -202,7 +202,7 @@
                DAL.ClsGy_Repair_Ctl oDept = new DAL.ClsGy_Repair_Ctl();
                DAL.ClsGy_Repair_View oDeptHlp = new DAL.ClsGy_Repair_View();
                List<MaintenanceMode> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceMode>>(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;
@@ -211,8 +211,6 @@
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
@@ -230,10 +228,13 @@
                oCN.RunProc("Insert Into Gy_Repair " +
                "(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_Repair set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                if (list[0].HItemID.ToString() != "")
                {
                    oCN.RunProc("Update Gy_Repair set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -281,7 +282,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;
@@ -289,7 +290,7 @@


                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -362,7 +363,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_RepairType", "Gy_RepairType");
                ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Repair", "Gy_Repair");

                objJsonResult.code = "1";
                objJsonResult.count = 1;