杨乐
2022-03-15 45ff656a53848046d6a2a457a00c22ab1e357513
WebAPI/Controllers/WebAPIController.cs
@@ -1270,10 +1270,21 @@
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            //string msg2 = sArray[0].ToString();
            //string msg3 = sArray[1].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //获取最大ID值赋值
@@ -1469,21 +1480,21 @@
        /// <returns></returns>
        [Route("DeltetGy_BadReason")]
        [HttpGet]
        public object DeltetGy_BadReason(string HItemID)
        public object DeltetGy_BadReason(string HItemID,string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败!无权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
@@ -1871,7 +1882,7 @@
        }
        /// <summary>
        /// 获取核算方式列表
        /// 获取核算方式组列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetClassTimePrjGroupList_Json")]
@@ -2098,50 +2109,99 @@
        /// <returns></returns>
        [Route("Web/GetSc_ICMOBillListView2")]
        [HttpGet]
        public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID)
        public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
        {
            if (ICMOBill != "")
            {
                sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                int count = 0;
                int pageNum = page;
                int pageSize = limit;
                string sWhere = "";
                if (ICMOBill == null || ICMOBill.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
                    sWhere = " where 1=1";
                }
                else
                {
                    string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
                    sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%'";
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
                count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
                //string sql = string.Format(@"select top " + pageSize + " hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from h_v_PackUnionBillList " + sWhere + ")   as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
                string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>''  order by hmainid   offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
                string aa = ds.Tables[0].Columns[0].ToString();
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                    objJsonResult.code = "1";
                    objJsonResult.count = count;
                    objJsonResult.Message = "返回记录成功!";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式,然后再反序列化回来
                    return objJsonResult;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "暂无记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            //if (ICMOBill != "")
            //{
            //    sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
            //}
            //try
            //{
            //    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //    if (sWhere == null || sWhere.Equals(""))
            //    {
            //        ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
            //    }
            //    else
            //    {
            //        string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
            //        ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
            //    }
            //    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>