Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService

kyy

2025-10-18 042211a2f7a2a008991d08fd3919f0a327408e47

Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService

 WebApi/Gs.Report/CkController.cs

@@ -327,6 +327,68 @@
                ReturnCode.Success, "读取成功");
        }


        /// <summary>
        ///  龙巍库存明细
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [RequestMethod(RequestMethods.POST)]
        public ReturnDto<PageList<dynamic>> GetListPageLw([FromBody] dynamic model)
        {
            int currentPage = model.currentPage;
            int everyPageSize = model.everyPageSize;
            string sortName = model.sortName;
            string keyWhere = model.keyWhere;
            SqlParameter[] parameters =
            {
            new("@inCurrentPage", currentPage),
            new("@inEveryPageSize", everyPageSize),
            new("@inSortName", sortName),
            new("@inSortOrder", ""),
            new("@inQueryWhere", keyWhere),
            new("@inFid", ""),
            new("@inP1", ""),
            new("@inP2", ""),
            new("@inP3", ""),
            new("@inP4", "")
        };
            var dset = new DataSet();
            var _pglist = new PageList<dynamic>
            {
                total = 0,
                everyPageSize = 0,
                pages = 0,
                list = new List<dynamic>()
            };
            try
            {
                dset = DbHelperSQL.RunProcedure("report_cktm_lw", parameters, "0");
                if (dset != null && dset.Tables.Count > 0 &&
                    dset.Tables[0].Rows.Count > 0) //有数据
                {
                    var intTotal =
                        int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
                    var pages = intTotal % everyPageSize != 0
                        ? intTotal / everyPageSize + 1
                        : intTotal / everyPageSize;
                    _pglist.total = intTotal;
                    _pglist.everyPageSize = everyPageSize;
                    _pglist.pages = pages;
                    var _dy = dset.Tables[0].TableToDynamicList();
                    _pglist.list = _dy;
                }
            }
            catch (Exception ex)
            {
                LogHelper.Debug(ToString(), ex.Message);
            }

            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
                ReturnCode.Success, "读取成功");
        }


        /// <summary>
        ///     读取
        /// </summary>

 WebApi/Gs.Report/XlsInOutController.cs

@@ -446,7 +446,7 @@
            { "检验水平", "t9" },
            { "接受水平", "t10" },
            { "检验要求", "t11" },
            { "样品数", "t12" },
            { "样品基数", "t12" },
        };
        string tmpGuid = mode.tmpGuid;
        string strType = mode.strType;//用于判断iqc,ipqc首检，ipqc巡检，fqc