合并

yusijie

2 天以前 6866dbd4b0b8703811872669179a68841eea803d

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -7436,10 +7436,129 @@
        }
        #endregion

        #region 工作联系单列表
        #region 工作联系单列表 使用下拉加载 调用存储过程
        [Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListProcess")]
        [HttpGet]
        public object GetOA_WorkLinkBillList2(string beginDate, string endDate, string user, string type, int page = -1, int size = -1)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("OA_WorkLinkBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = $"exec h_p_OA_WorkLinkBillAllList '{user}', '{type}', '{page}', '{size}', '{beginDate}', '{endDate}'";

                ds = oCN.RunProcReturn(sql, "h_p_OA_WorkLinkBillAllList");
                

                //添加列名
                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列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion



        #region 工作联系单列表 使用下拉加载        
        [Route("Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList")]
        [HttpGet]
        public object GetOA_WorkLinkBillList(string sWhere, string user, int page, int size)
        public object GetOA_WorkLinkBillList2(string sWhere, string user, int page = -1, int size = -1)
        {
            if(page == -1 || size == -1)
            {
                return GetOA_WorkLinkBillList(sWhere, user);
            }else
            {
                try
                {
                    List<object> columnNameList = new List<object>();

                    //查看权限
                    if (!DBUtility.ClsPub.Security_Log("OA_WorkLinkBillList", 1, false, user))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "无查看权限！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (sWhere == null || sWhere.Equals(""))
                    {
                        string sql = "select * from h_v_OA_WorkLinkBillAllList order by 单据号 desc";
                        sql += $@" OFFSET {(page-1)*size} ROWS
                                FETCH NEXT {size} ROWS ONLY; ";
                        ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
                    }
                    else
                    {
                        string sql1 = "select * from h_v_OA_WorkLinkBillAllList where 1 = 1 ";
                        string sql = sql1 + sWhere + " order by 单据号 desc";
                        sql += $@" OFFSET {(page - 1) * size} ROWS
                                FETCH NEXT {size} ROWS ONLY; ";

                        ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
                    }

                    //添加列名
                    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列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                catch (Exception ex)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常，请与管理员联系！" + ex.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
        }
        #endregion


        #region 工作联系单列表
        public object GetOA_WorkLinkBillList(string sWhere, string user)
        {
            try
            {
@@ -7458,16 +7577,13 @@
                if (sWhere == null || sWhere.Equals(""))
                {
                    string sql = "select * from h_v_OA_WorkLinkBillAllList order by 单据号 desc";
                    sql += $@"OFFSET {page-1 * size} ROWS
                            FETCH NEXT {size} ROWS ONLY; ";
                    ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
                }
                else
                {
                    string sql1 = "select * from h_v_OA_WorkLinkBillAllList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 单据号 desc";
                    sql += $@"OFFSET {page - 1 * size} ROWS
                            FETCH NEXT {size} ROWS ONLY; ";

                    ds = oCN.RunProcReturn(sql, "h_v_OA_WorkLinkBillAllList");
                }

@@ -8596,7 +8712,18 @@

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'"  , "h_p_OA_ErrMsgBackSelfQuery");
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //系统参数  根据角色查看对应的单据进行下推
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_Role  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_Role");
                    }
                    else
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery  '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery");
                    }
                }                

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
@@ -8650,8 +8777,18 @@
                string HEndDate = dic["HEndDate"].ToString();//结束日期

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //系统参数  根据角色查看对应的单据进行下推
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP_Role '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP_Role");
                    }
                    else
                    {
                        ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
                    }
                }

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {