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

jhz

2023-03-21 d84518084c3027a684333929ad80b51a0c32845b

 WebAPI/Controllers/WebAPIController.cs

@@ -833,6 +833,72 @@
        }


        ///// <summary>
        ///// 获取仓位列表
        ///// </summary>
        ///// <returns></returns>
        //[Route("Web/GetStockPlaceList_Json_NEW")]
        //[HttpGet]
        //public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
        //{
        //    WebS.WebService1 oWeb = new WebS.WebService1();
        //    sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
        //    //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
        //    if (HWhID == 0)
        //    {
        //        if (StockPlace != "")
        //        {
        //            sWhere = " Where HStopFlag=0 and HUSEORGID = " + HOrgID + "  and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
        //        }
        //        else
        //        {
        //            sWhere = " Where HStopFlag=0 ";
        //        }
        //    }
        //    else
        //    {
        //        if (StockPlace != "")
        //        {
        //            sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
        //        }
        //        else
        //        {
        //            sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
        //        }
        //    }
        //    try
        //    {
        //        //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
        //        ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
        //        if (ds == null || ds.Tables[0].Rows.Count <= 0)
        //        {
        //            objjson.code = "0";
        //            objjson.count = 0;
        //            objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
        //            objjson.data = null;
        //            return objjson;
        //        }
        //        else
        //        {
        //            objjson.code = "0";
        //            objjson.count = 1;
        //            objjson.Message = "获取成功!";
        //            objjson.data = ds.Tables[0];
        //            return objjson;
        //        }
        //    }
        //    catch (Exception ex)
        //    {

        //        objjson.code = "0";
        //        objjson.count = 0;
        //        objjson.Message = "获取失败" + ex.ToString();
        //        objjson.data = null;
        //        return objjson;
        //    }
        //}


        /// <summary>
        /// 获取仓位列表
        /// </summary>
@@ -3983,12 +4049,12 @@
        /// <returns></returns>
        [Route("Web/GetProcNoList")]
        [HttpGet]
        public object GetProcNoList(int HInterID,string sWhere)
        public object GetProcNoList(int HInterID,string sWhere,string UserID)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "'", "h_p_Sc_ProcNoList");
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "','" + UserID + "'" , "h_p_Sc_ProcNoList");

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