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

王 垚

2022-11-29 b4e78e5b10fd9777e44a9114aad3502edfd43037

 WebAPI/Controllers/PublicPageMethodController.cs

@@ -1481,6 +1481,47 @@
        }
        #endregion



        #region 出库申请单查询列表
        [Route("OtherOutRequestBillList/CX")]
        [HttpGet]
        public object CX(string sWhere)
        {
            try
            {
                
                    string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    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/EqpCX")]
        [HttpGet]