SJ,XJ,RKJ优化修改

xwt

7 天以前 e853dd2fecef3a0c446d161248d0498a5a081e66

 StandardInterface/MES.Service/service/QC/SJService.cs

@@ -44,69 +44,145 @@
        if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
            lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var query = db.Queryable<SJPageResult>()
            .WhereIF(lineNo != null && lineNo.Length > 0,
                a => lineNo.Contains(a.line))
            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
            .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
                a => a.BillNo == queryObj.BillNo)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                "未完成".Equals(queryObj.Result),
                a => a.Fsubmit == 0)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.Fsubmit == 1);

        // 新增的动态搜索逻辑
        if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
        // 如果有车间或线体筛选，需要联接 MES_LINE 表
        if (!string.IsNullOrEmpty(queryObj.departmentId) || !string.IsNullOrEmpty(queryObj.lineId))
        {
            switch (queryObj.searchField)
            var query = db.Queryable<SJPageResult, MesLine>((a, m) => 
                    new JoinQueryInfos(JoinType.Left, a.line == m.LineNo))
                .WhereIF(lineNo != null && lineNo.Length > 0,
                    (a, m) => lineNo.Contains(a.line))
                .WhereIF(queryObj.Id != null, (a, m) => a.Id == queryObj.Id)
                .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
                    (a, m) => a.BillNo == queryObj.BillNo)
                .WhereIF(
                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                    "未完成".Equals(queryObj.Result),
                    (a, m) => a.Fsubmit == 0)
                .WhereIF(
                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                    !"未完成".Equals(queryObj.Result),
                    (a, m) => a.Fsubmit == 1)
                // 添加车间筛选
                .WhereIF(!string.IsNullOrEmpty(queryObj.departmentId),
                    (a, m) => m.DepotId.ToString() == queryObj.departmentId)
                // 添加线体筛选
                .WhereIF(!string.IsNullOrEmpty(queryObj.lineId),
                    (a, m) => m.LineNo == queryObj.lineId);

            // 添加搜索条件
            if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
            {
                case "daa001":  // 工单
                    query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
                    break;
                case "billNo":  // 检验单号
                    query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
                    break;
                case "line":    // 产线
                    query = query.Where(x => x.line.Contains(queryObj.SearchValue));
                    break;
                case "itemNo":  // 物料编码
                    query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
                    break;
                case "daa003":  // 物料名称
                    query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
                    break;
                default:
                    // 如果没有指定字段或字段不匹配，使用原有的模糊查询逻辑作为兜底方案
                    query = query.Where(x => 
                        x.ItemNo.Contains(queryObj.SearchValue) ||
                        x.Daa003.Contains(queryObj.SearchValue) ||
                        x.daa001.Contains(queryObj.SearchValue) ||
                        x.BillNo.Contains(queryObj.SearchValue) ||
                        x.line.Contains(queryObj.SearchValue));
                    break;
                switch (queryObj.searchField)
                {
                    case "daa001":  // 工单
                        query = query.Where((a, m) => a.daa001.Contains(queryObj.SearchValue));
                        break;
                    case "billNo":  // 检验单号
                        query = query.Where((a, m) => a.BillNo.Contains(queryObj.SearchValue));
                        break;
                    case "line":    // 产线
                        query = query.Where((a, m) => a.line.Contains(queryObj.SearchValue));
                        break;
                    case "itemNo":  // 物料编码
                        query = query.Where((a, m) => a.ItemNo.Contains(queryObj.SearchValue));
                        break;
                    case "daa003":  // 物料名称
                        query = query.Where((a, m) => a.Daa003.Contains(queryObj.SearchValue));
                        break;
                    default:
                        query = query.Where((a, m) => 
                            a.ItemNo.Contains(queryObj.SearchValue) ||
                            a.Daa003.Contains(queryObj.SearchValue) ||
                            a.daa001.Contains(queryObj.SearchValue) ||
                            a.BillNo.Contains(queryObj.SearchValue) ||
                            a.line.Contains(queryObj.SearchValue));
                        break;
                }
            }
            else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
            {
                query = query.Where((a, m) => 
                    a.ItemNo.Contains(queryObj.SearchValue) ||
                    a.Daa003.Contains(queryObj.SearchValue) ||
                    a.daa001.Contains(queryObj.SearchValue) ||
                    a.BillNo.Contains(queryObj.SearchValue) ||
                    a.line.Contains(queryObj.SearchValue));
            }

            var totalCount = 0;
            var data = query.OrderBy((a, m) => a.BillNo, OrderByType.Desc)
                .Select((a, m) => a)
                .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

            return (data, totalCount);
        }
        // 为了兼容旧版本，如果没有传递 searchField，使用原来的查询逻辑
        else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
        else
        {
            // 保持原有的多字段模糊查询逻辑
            query = query.Where(x => 
                x.ItemNo.Contains(queryObj.SearchValue) ||
                x.Daa003.Contains(queryObj.SearchValue) ||
                x.daa001.Contains(queryObj.SearchValue) ||
                x.BillNo.Contains(queryObj.SearchValue) ||
                x.line.Contains(queryObj.SearchValue));
            // 没有车间和线体筛选时，使用原来的查询逻辑
            var query = db.Queryable<SJPageResult>()
                .WhereIF(lineNo != null && lineNo.Length > 0,
                    a => lineNo.Contains(a.line))
                .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
                .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
                    a => a.BillNo == queryObj.BillNo)
                .WhereIF(
                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                    "未完成".Equals(queryObj.Result),
                    a => a.Fsubmit == 0)
                .WhereIF(
                    StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                    !"未完成".Equals(queryObj.Result),
                    a => a.Fsubmit == 1);

            // 新增的动态搜索逻辑
            if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
            {
                switch (queryObj.searchField)
                {
                    case "daa001":  // 工单
                        query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
                        break;
                    case "billNo":  // 检验单号
                        query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
                        break;
                    case "line":    // 产线
                        query = query.Where(x => x.line.Contains(queryObj.SearchValue));
                        break;
                    case "itemNo":  // 物料编码
                        query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
                        break;
                    case "daa003":  // 物料名称
                        query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
                        break;
                    default:
                        // 如果没有指定字段或字段不匹配，使用原有的模糊查询逻辑作为兜底方案
                        query = query.Where(x => 
                            x.ItemNo.Contains(queryObj.SearchValue) ||
                            x.Daa003.Contains(queryObj.SearchValue) ||
                            x.daa001.Contains(queryObj.SearchValue) ||
                            x.BillNo.Contains(queryObj.SearchValue) ||
                            x.line.Contains(queryObj.SearchValue));
                        break;
                }
            }
            // 为了兼容旧版本，如果没有传递 searchField，使用原来的查询逻辑
            else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
            {
                // 保持原有的多字段模糊查询逻辑
                query = query.Where(x => 
                    x.ItemNo.Contains(queryObj.SearchValue) ||
                    x.Daa003.Contains(queryObj.SearchValue) ||
                    x.daa001.Contains(queryObj.SearchValue) ||
                    x.BillNo.Contains(queryObj.SearchValue) ||
                    x.line.Contains(queryObj.SearchValue));
            }

            var totalCount = 0;
            var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
                .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

            return (data, totalCount);
        }

        var totalCount = 0;
        var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

        return (data, totalCount);
    }


@@ -208,7 +284,8 @@
                Mnum = b.Mnum,  // 从主表获取MNUM
                Dnum = b.Dnum,  // 从子表获取DNUM
                Snum = a.Snum,  // 送检批数
                Remarks = a.Remarks
                Remarks = a.Remarks,
                Forder = a.Forder  // 顺序字段
            }).ToList();

        var array = qsItemIpiItems.Select(s => s.Id).ToArray();
@@ -288,20 +365,52 @@
            }
        });

        //使用linq表达式过滤出图片id不为空的数据
        var itemIpiItems =
            qsItemIpiItems.Where(s => s.Picture is { Length: > 0 })
                .ToList();
        if (itemIpiItems.Count > 0)
            itemIpiItems.ForEach(s =>
        // 从 QS_ITEM_IPI_IMAGE 表中获取图片数据（支持多图片）
        var itemIds = qsItemIpiItems.Select(s => s.Id).ToArray();
        var imageList = db.Queryable<QsItemIpiImage>()
            .Where(s => itemIds.Contains(s.Fid) && s.QsType == 1 && s.ImageData != null)
            .ToList();
        
        if (imageList.Count > 0)
        {
            // 按检验项目ID分组
            var imageGroups = imageList.GroupBy(img => img.Fid);
            foreach (var group in imageGroups)
            {
                var qsItemIpiItem = qsItemIpiItems.Find(t => t.Id == s.Id);
                //将字节数组转换为Base64编码的字符串
                qsItemIpiItem.imageData = Convert.ToBase64String(s.Picture);
            });
                var qsItemIpiItem = qsItemIpiItems.Find(t => t.Id == group.Key);
                if (qsItemIpiItem != null)
                {
                    // 初始化图片列表
                    qsItemIpiItem.imageList = new List<ImageInfo>();
                    
                    foreach (var img in group)
                    {
                        if (img.ImageData != null && img.ImageData.Length > 0)
                        {
                            qsItemIpiItem.imageList.Add(new ImageInfo
                            {
                                Id = img.Id ?? 0,
                                FileName = img.Picturename,
                                Base64Data = Convert.ToBase64String(img.ImageData),
                                CreateDate = img.CreateDate,
                                CreateBy = img.CreateBy
                            });
                        }
                    }
                    
                    // 保持向后兼容：如果有图片，设置第一张图片为 imageData
                    if (qsItemIpiItem.imageList.Count > 0)
                    {
                        qsItemIpiItem.imageData = qsItemIpiItem.imageList[0].Base64Data;
                    }
                }
            }
        }

        //排序，未完成的排在前面
        qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
        //排序：只按FORDER顺序排序
        qsItemIpiItems = qsItemIpiItems
            .OrderBy(s => s.Forder ?? 0)
            .ToList();

        // 为每个检验项目生成穴号信息
        qsItemIpiItems.ForEach(item =>
@@ -1030,9 +1139,9 @@
    }

    /// <summary>
    /// 上传图片到检验项目的PICTURE字段
    /// 上传图片到 QS_ITEM_IPI_IMAGE 表
    /// </summary>
    /// <param name="id">检验项目ID</param>
    /// <param name="id">检验项目ID (FID)</param>
    /// <param name="imageBytes">图片字节数组</param>
    /// <param name="fileName">原始文件名</param>
    /// <param name="createBy">创建人</param>
@@ -1065,30 +1174,34 @@
                return (1, "图片大小不能超过5MB");
            }

            // 生成时间戳文件名，格式：1746945271304.jpg
            var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
            var timestampFileName = $"{timestamp}{extension}";

            var result = SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                // 检查检验项目是否存在
                var exists = db.Queryable<QsItemIpiItem>()
                // 检查检验项目是否存在，并获取检验单ID (GID) 和 检验项目名称 (PROJ_NAME)
                var ipiItem = db.Queryable<QsItemIpiItem>()
                    .Where(s => s.Id == id)
                    .Any();
                    .Select(s => new { s.Id, s.Pid, s.ProjName })
                    .First();

                if (!exists)
                if (ipiItem == null)
                {
                    throw new Exception("检验项目不存在");
                }

                // 更新PICTURE字段（LONG RAW类型）和PICTURENAME字段（时间戳文件名）
                var updateResult = db.Updateable<QsItemIpiItem>()
                    .SetColumns(s => s.Picture == imageBytes)
                    .SetColumns(s => s.Picturename == timestampFileName)
                    .Where(s => s.Id == id)
                    .ExecuteCommand();
                // 每次都创建新的图片记录，支持多图片上传
                var newImage = new QsItemIpiImage
                {
                    Fid = id,                        // 检验项目ID
                    Gid = ipiItem.Pid,               // 检验单ID（从检验项目的Pid获取）
                    QsType = 1,                      // 首检类型
                    ImageData = imageBytes,          // 图片二进制数据
                    Picturename = fileName,          // 保留原始文件名
                    JyName = ipiItem.ProjName,       // 检验项目名称
                    CreateDate = DateTime.Now,       // 创建时间
                    CreateBy = createBy              // 创建人
                };

                return updateResult;
                var insertResult = db.Insertable(newImage).ExecuteCommand();
                return insertResult;
            });

            if (result > 0)
@@ -1097,7 +1210,7 @@
            }
            else
            {
                return (1, "图片保存失败，未找到对应的检验项目");
                return (1, "图片保存失败");
            }
        }
        catch (Exception ex)
@@ -1107,11 +1220,12 @@
    }

    /// <summary>
    /// 删除检验项目的图片
    /// 删除检验项目的图片（从 QS_ITEM_IPI_IMAGE 表中删除）
    /// </summary>
    /// <param name="id">检验项目ID</param>
    /// <param name="id">检验项目ID (FID)，当imageId为空时删除该检验项目的所有图片</param>
    /// <param name="imageId">图片ID，用于删除单张图片（可选）</param>
    /// <returns>操作结果</returns>
    public (int status, string message) DeleteImageFromPicture(decimal id)
    public (int status, string message) DeleteImageFromPicture(decimal id, decimal? imageId = null)
    {
        try
        {
@@ -1127,14 +1241,23 @@
                    throw new Exception("检验项目不存在");
                }

                // 清空PICTURE字段和PICTURENAME字段
                var updateResult = db.Updateable<QsItemIpiItem>()
                    .SetColumns(s => s.Picture == null)
                    .SetColumns(s => s.Picturename == null)
                    .Where(s => s.Id == id)
                    .ExecuteCommand();
                int deleteResult;
                if (imageId.HasValue)
                {
                    // 删除指定的单张图片
                    deleteResult = db.Deleteable<QsItemIpiImage>()
                        .Where(s => s.Id == imageId.Value && s.Fid == id && s.QsType == 1)
                        .ExecuteCommand();
                }
                else
                {
                    // 删除该检验项目的所有图片
                    deleteResult = db.Deleteable<QsItemIpiImage>()
                        .Where(s => s.Fid == id && s.QsType == 1)
                        .ExecuteCommand();
                }

                return updateResult;
                return deleteResult;
            });

            if (result > 0)
@@ -1143,7 +1266,7 @@
            }
            else
            {
                return (1, "图片删除失败，未找到对应的检验项目");
                return (1, "图片删除失败，未找到对应的图片记录");
            }
        }
        catch (Exception ex)