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

yangle

2022-11-21 ff1d21b0cff4b0920cefcd4c40da3956793a4a7c

 WebAPI/Controllers/WebAPIController.cs

@@ -1286,6 +1286,65 @@
        }

        /// <summary>
        /// 获取计量单位组列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetUnitGroupList_Json")]
        [HttpGet]
        public object GetUnitGroupList_Json(string Unit)
        {
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Unit != "" && Unit != null)
            {
                sWhere = sWhere + " and ( HNumber like '%" + Unit + "%' or HName like '%" + Unit + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber 计量单位组代码,HName 计量单位组 from Gy_UnitGroup where HStopflag=0 Order by HItemID ", "Gy_UnitGroup");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber 计量单位组代码,HName 计量单位组 from Gy_UnitGroup where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_UnitGroup");
                }

                //ds = webserver.GetUnitList(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>
        /// <returns></returns>
@@ -3636,6 +3695,38 @@
            }
        }
        #endregion

        /// <summary>
        /// 获取流水号列表
        /// </summary>
        /// <param name="HInterID"></param>
        /// <returns></returns>
        [Route("Web/GetProcNoList")]
        [HttpGet]
        public object GetProcNoList(int HInterID,string sWhere)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                ds = oCN.RunProcReturn("exec h_p_Sc_ProcNoList '" + HInterID + "','" + sWhere + "'", "h_p_Sc_ProcNoList");

                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 = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }

    }

}