合并

ch

2022-11-17 b821703f9879a957937d730e46ed1305b404094e

 WebAPI/Controllers/PublicPageMethodController.cs

@@ -1919,6 +1919,33 @@
        }
        #endregion

        #region 获取全部物料信息
        [Route("PublicPageMethod/MaterialList")]
        [HttpGet]
        public object MaterialList(string sWhere)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_KF_ICInventoryList_IF" + sWhere , "h_v_KF_ICInventoryList_IF");

                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/PartCX")]
        [HttpGet]
@@ -3587,13 +3614,13 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrjGroup");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0  ";
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrjGroup where HStopflag=0  ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                }

                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);