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

yusijie

2025-02-12 d19fcd70a3b11339eb0c50b5c734eeca855a9a95

 WebAPI/Controllers/PublicPageMethodController.cs

@@ -918,6 +918,35 @@
                return objJsonResult;
            }
        }

        [Route("PublicPageMethod/Gy_RepairList_PDA")]
        [HttpGet]
        public object Gy_RepairList_PDA(string sWhere)
        {
            try
            {
                if (sWhere != "" && sWhere != null)
                {
                    sWhere = "  and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
                }
                string sql1 = string.Format(@"Select HItemID,HParentID,HNumber,HName from Gy_Repair where HStopflag=0");
                ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "Gy_Repair");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  根据树型id查找维修项目列表   
@@ -1365,7 +1394,37 @@
                return objJsonResult;
            }
        }
        #endregion
        //故障原因页面优化后查询 20250113
        [Route("PublicPageMethod/Gy_ConkReasonList_PDA")]
        [HttpGet]
        public object List_PDA(string sWhere)
        {
            try
            {
                if (sWhere != "" && sWhere != null)
                {
                    sWhere = "  and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
                }
                string sql1 = string.Format(@"Select HItemID,HParentID,HNumber,HName from Gy_ConkReason where HStopflag=0");
                ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "Gy_ConkReason");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion        

        #region  根据树型id查找故障原因设置列表   
        [Route("Gy_MaintenanceMode/FaultReasonCX")]