zzr99
2022-02-10 dac1d793ad118eebf9048588a356ae0ea8a3aa95
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -28,31 +28,45 @@
        public DAL.ClsSc_PackUnionBill BillNew0 = new DAL.ClsSc_PackUnionBill();   //
        public DAL.ClsSc_PackUnionBill BillOld0 = new DAL.ClsSc_PackUnionBill();   //
        #region 组托单列表
        #region [组托单查询功能]
        /// <summary>
        /// 组托单查询功能
        /// </summary>
        /// <returns></returns>
        [Route("Sc_PackUnionBill/Get_PackUnionBillList")]
        [HttpGet]
        public object GetMateOutBillList(int page, int limit, string sWhere)
        public object Get_PackUnionBillList(int page, int limit, string sWhere,string user)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_PackUnionBill_Query",1,false,user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                int count = 0;
                int pageNum = page;
                int pageSize = limit;
                if (sWhere == null || sWhere.Equals(""))
                {
                    sWhere = " where 1=1";
                    sWhere = " where 1=1 order by hmainid desc ";
                }
                else
                {
                    sWhere = " where 1=1" + sWhere;
                    sWhere = " where 1=1" + sWhere+ " order by hmainid desc ";
                }
                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_PackUnionBillList " + sWhere, "h_v_PackUnionBillList");
                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_PackUnionBillList "+sWhere+"", "h_v_PackUnionBillList");
                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 hmainid,日期,单据号,箱号条形码,条码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from h_v_PackUnionBillList " + sWhere + "  order by hmainid  offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
                string sql = string.Format(@"select hmainid,日期,单据号,箱号条形码,条码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from h_v_PackUnionBillList " + sWhere + " order by hmainid   offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_PackUnionBillList");
                string aa = ds.Tables[0].Columns[0].ToString();
@@ -107,14 +121,14 @@
            try
            {
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Sc_PackUnionBill", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log_second("Sc_PackUnionBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string s = "";
                Int64 lngBillKey = 0;