优化首检巡检生成检验

zyf

2025-10-30 7a783a92137f59a02041d71dcdc8bca7e5a3a0b4

 MES.Service/service/QC/SJService.cs

@@ -16,6 +16,7 @@
using System;
using System.Security.Cryptography;
using SqlSugar.Extensions;
using Masuit.Tools.Reflection;

namespace MES.Service.service.QC;

@@ -115,7 +116,8 @@
                Daa008 = a.Daa008,
                LineName = a.LineName,
                SaleOrder = ca.Caa015,
                DepartName = d.Departmentname
                DepartName = d.Departmentname,
                PlanName = a.PlanName
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
@@ -320,17 +322,33 @@
            .Where(s => s.Gid == item.gid)
            .ExecuteCommand();


        var qsItemIpiItems = item.Items;
        SqlSugarHelper.UseTransactionWithOracle(
            db =>
            {
                // 1. 设置父级ID
                qsItemIpiItems.ForEach(s => s.Pid = item.gid);
                return db.Insertable(qsItemIpiItems).ExecuteCommand();

                // 2. 插入
                db.Insertable(qsItemIpiItems).ExecuteCommand();

                // 3. 重新从数据库查询插入后的记录（按 pid 查询） 防止检验结果更新到旧项目上
                qsItemIpiItems = db.Queryable<QsItemIpiItem>()
                                    .Where(x => x.Pid == item.gid)
                                    .ToList();

                // ✅ 返回值不重要，只要保证事务提交即可
                return 1;
            });




        //item.Items = getQSItems(item.gid, null);

        //没有上下限的检验项目自动盘点为合格
        item.Items.ForEach(s =>
        qsItemIpiItems.ForEach(s =>
        {
            if (s.MaxValue != null || s.StandardValue != null || s.MinValue != null)
            {
@@ -351,7 +369,19 @@
        return item;
    }

    public List<string?> GetItemProj(string? itemNo)
    public decimal SavePlan(decimal pid,string PlanName)
    {
        var db = SqlSugarHelper.GetInstance();
        var res = db.Updateable<QsItemIpiReq>()
                          .SetColumns(a => a.QaPlan == PlanName)
                          .Where(a => a.Id == pid)
                          .ExecuteCommand();

        return res;

    }

        public List<string?> GetItemProj(string? itemNo)
    { //获取物料所有的检验计划名称

        var db = SqlSugarHelper.GetInstance();