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

ch

2022-07-08 a51f8f5bd43b4dc86481f04c85842f27f119caea

 WebAPI/Controllers/WebAPIController.cs

@@ -79,6 +79,55 @@
                return objjson;
            }
        }



        //[Route("Web/Get_MaxBillNoAndID")]
        //[HttpGet]
        //public object Get_MaxBillNoAndID(string HBillType)
        //{
        //    try
        //    {
        //        string HBillNo = "";
        //        Int64 HInterID = 0;//显示的字段
        //        HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
        //        HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
        //        //----------创建虚表------------------------
        //        DataTable dt_Main = new DataTable("Json");
        //        dt_Main.Columns.Add("HBillNo", typeof(string));
        //        dt_Main.Columns.Add("HInterID", typeof(int));
        //        //---------创建新行------------------------
        //        DataRow dr_main = dt_Main.NewRow();//创建新行 
        //        dt_Main.Rows.Add(dr_main);//将新行加入到表中
        //        dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
        //        dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);

        //        if (HBillNo == null || HInterID == 0)
        //        {
        //            objjson.code = "0";
        //            objjson.count = 0;
        //            objjson.Message = "获取失败";
        //            objjson.data = null;
        //            return objjson;
        //        }
        //        else
        //        {
        //            objjson.code = "0";
        //            objjson.count = 1;
        //            objjson.Message = "获取成功";
        //            objjson.data = dt_Main;
        //            return objjson;
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        objjson.code = "0";
        //        objjson.count = 0;
        //        objjson.Message = "获取失败" + e.ToString();
        //        objjson.data = null;
        //        return objjson;
        //    }
        //}
        /// <summary>
        /// 登录
        /// </summary>
@@ -3371,7 +3420,62 @@
        }


        #region PDA其他入库列表模块
        /// <summary>
        /// 其他入库缓存列表刷新信息
        /// </summary>
        /// <param name="HBillType"></param>
        /// <param name="sHMaker"></param>
        /// <param name="HOrgID"></param>
        /// <returns></returns>
        [Route("Web/GetOtherInBillMain_TempList_New")]
        [HttpGet]
        public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                List<object> columnNameList = new List<object>();
                
                DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
                
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }

}