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

yusijie

2023-03-10 3fd4847817d5e865f01c06aed880102cc27de043

 WebAPI/Controllers/Kf_ICStockBillMainController.cs

@@ -20,35 +20,46 @@
        #region 销售退货单查询
        [Route("Kf_ICStockBillMain/GetCStockBillList")]
        [HttpGet]
        public object GetCStockBillList(string sWhere)
        public object GetCStockBillList(string sWhere,string user)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain");
                }
                else
                {
                    string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Kf_ICStockBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1 order by hmainid desc", "h_v_IF_Kf_ICStockBillMain");
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -66,18 +77,20 @@
        [HttpGet]
        public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            //IsAudit=1 审核；  IsAudit=2 反审核
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无审核权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
           
            try
            {
                //IsAudit=1 审核；  IsAudit=2 反审核
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Kf_ICStockBill_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无审核权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);
                if (lngBillKey == 0)