来料检，入库检，首检巡检。

xwt

7 天以前 82dac540156cb29e58c86f7d7d840e3c7e548c15

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

@@ -3,6 +3,8 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using System.Linq;
using System.Data;

namespace MES.Service.service.QC;

@@ -16,22 +18,49 @@
    {
        var db = SqlSugarHelper.GetInstance();
        var date = DateTime.Now.ToString("yyyy-MM-dd");
        var sql =
            "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" +
            date + "'";

        var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);

        var number = "0001";
        if (maxBillNo != null)
        
        try
        {
            maxBillNo = maxBillNo.Substring(12);
            var no = Convert.ToInt32(maxBillNo);
            no++;
            number = no.ToString().PadLeft(4, '0');
        }
            // 查询当天所有以RKJY开头的检验单号
            var sql = @"
                SELECT RELEASE_NO 
                FROM QS_ITEM_OQC_REQ 
                WHERE RELEASE_NO LIKE 'RKJY%' 
                AND TO_CHAR(CREATE_DATE,'yyyy-mm-dd') = @date
                ORDER BY RELEASE_NO DESC";

        return "RKJN" + date.Replace("-", "") + number;
            var existingNumbers = db.Ado.SqlQuery<string>(sql, new { date });
            
            var number = "0001";
            if (existingNumbers != null && existingNumbers.Count > 0)
            {
                // 找到最大的编号
                var maxNumber = existingNumbers
                    .Where(x => x != null && x.Length >= 16) // 确保长度足够
                    .Select(x => x.Substring(12, 4))
                    .Where(x => int.TryParse(x, out _))
                    .Select(x => int.Parse(x))
                    .DefaultIfEmpty(0)
                    .Max();
                
                number = (maxNumber + 1).ToString().PadLeft(4, '0');
            }

            var result = "RKJY" + date.Replace("-", "") + number;
            
            // 添加日志记录（可选）
            Console.WriteLine($"Generated RKJ number: {result}, Date: {date}, Existing count: {existingNumbers?.Count ?? 0}");
            
            return result;
        }
        catch (Exception ex)
        {
            // 如果出现异常，使用时间戳作为备选方案
            var timestamp = DateTime.Now.ToString("yyyyMMddHHmmss");
            var fallbackNumber = "RKJY" + date.Replace("-", "") + timestamp.Substring(8, 4);
            Console.WriteLine($"Error generating RKJ number, using fallback: {fallbackNumber}, Error: {ex.Message}");
            return fallbackNumber;
        }
    }

    //选择产线
@@ -48,16 +77,84 @@
            .ToList();
    }


    //获取工单号
    public List<RKJDaa001> GetDaa001s(string lineNo)
    /// <summary>
    /// 获取有线体的部门列表（生产车间）
    /// </summary>
    /// <returns>部门列表</returns>
    public List<dynamic> GetDepartmentsWithLines()
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<RKJDaa001>()
            .Where(t => t.Daa020 == lineNo)
            .OrderBy(t => t.ItemInId, OrderByType.Desc)
        var sql = @"
            SELECT DISTINCT 
                d.DEPARTMENTID as departmentid,
                d.DEPARTMENTNAME as departmentname
            FROM SYS_DEPARTMENT d
            INNER JOIN MES_LINE l ON d.DEPARTMENTID = l.DEPOT_ID
            WHERE L.LINE_NO IS NOT NULL
            ORDER BY d.DEPARTMENTNAME";

        return db.Ado.SqlQuery<dynamic>(sql);
    }

    /// <summary>
    /// 根据部门ID获取该部门下的线体列表
    /// </summary>
    /// <param name="departmentId">部门ID</param>
    /// <returns>线体列表</returns>
    public List<dynamic> GetLinesByDepartment(string departmentId)
    {
        var db = SqlSugarHelper.GetInstance();
        var sql = @"
            SELECT 
                l.LINE_NO as lineNo,
                l.LINE_NAME as lineName
            FROM MES_LINE l
            WHERE l.DEPOT_ID = @departmentId
            ORDER BY l.LINE_NAME";

        return db.Ado.SqlQuery<dynamic>(sql, new { departmentId });
    }

    /// <summary>
    /// 保存部门选择
    /// </summary>
    /// <param name="id">检验单ID</param>
    /// <param name="departmentId">部门ID</param>
    /// <param name="departmentName">部门名称</param>
    /// <returns>操作结果</returns>
    public bool SaveDepartmentSelection(decimal id, string departmentId, string departmentName)
    {
        var db = SqlSugarHelper.GetInstance();
        var sql = @"
            UPDATE QS_ITEM_OQC_REQ 
            SET WORK_SHOP = @departmentName, DEPARTMENT_ID = @departmentId
            WHERE ID = @id";

        return db.Ado.ExecuteCommand(sql, new { id, departmentId, departmentName }) > 0;
    }


    //获取工单号
    public List<Womdaa> GetDaa001s(string lineNo)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<Womdaa, MesItems>((w, m) => new JoinQueryInfos(
                JoinType.Left, w.Daa002 == m.Id.ToString()))
            .Where((w, m) => w.Daa015 == lineNo)
            .OrderBy((w, m) => w.Daa001, OrderByType.Desc)
            .Select((w, m) => new Womdaa
            {
                Id = w.Id,
                Daa001 = w.Daa001, // 工单号
                Daa002 = m.ItemNo, // 产品编码（从MesItems表获取）
                Daa003 = w.Daa003, // 产品名称
                Daa004 = w.Daa004, // 产品规格
                Daa008 = w.Daa008, // 工单数量
                Daa015 = w.Daa015, // 生产线别
                // 添加物料ID字段
                ItemId = m.Id // 物料ID
            })
            .ToList();
        //return null;
    }

    //根据检验标准来计算检验个数
@@ -228,6 +325,55 @@

            xj.CreateBy = userNo;
            xj.CreateDate = DateTime.Now;
            
            // 确保检验单号被正确设置
            if (string.IsNullOrEmpty(xj.ReleaseNo))
            {
                xj.ReleaseNo = getMaxBillNo();
            }
            
            // 确保生产线编号被正确设置
            if (string.IsNullOrEmpty(xj.LineNo) && !string.IsNullOrEmpty(xj.Daa015))
            {
                xj.LineNo = xj.Daa015;
            }
            
            // 确保工单号被正确设置
            if (string.IsNullOrEmpty(xj.BillNo) && !string.IsNullOrEmpty(xj.RbillNo))
            {
                xj.BillNo = xj.RbillNo;
            }
            
            // 确保物料ID被正确设置（如果为空，尝试从物料编码获取）
            if (xj.ItemId == null && !string.IsNullOrEmpty(xj.ItemNo))
            {
                // 从物料编码获取物料ID
                var itemId = db.Queryable<MesItems>()
                    .Where(m => m.ItemNo == xj.ItemNo)
                    .Select(m => m.Id)
                    .First();
                
                if (itemId > 0)
                {
                    xj.ItemId = itemId;
                }
            }
            
            // 新增：保存送检批次
            if (!string.IsNullOrEmpty(rkjDto.RbillNo))
                xj.RbillNo = rkjDto.RbillNo;
                
            // 确保Quantity字段被正确设置
            if (xj.Quantity == null && rkjDto.quantity != null)
            {
                xj.Quantity = rkjDto.quantity;
            }
            
            // 确保提交状态被正确设置（默认为未提交）
            if (xj.Fsubmit == null)
            {
                xj.Fsubmit = 0;
            }

            var pid = db.Insertable(xj).ExecuteReturnIdentity();

@@ -249,32 +395,32 @@
        //     var transaction = connection.BeginTransaction();
        //
        //     try
        //     {
        //         using (var command = new OracleCommand())
        //         {
        //             command.Connection = connection;
        //             command.Transaction = transaction;
        //             command.CommandText = "insert_and_update_picture_RKJ";
        //             command.CommandType = CommandType.StoredProcedure;
        //             using (var command = new OracleCommand())
        //             {
        //                 command.Connection = connection;
        //                 command.Transaction = transaction;
        //                 command.CommandText = "insert_and_update_picture_RKJ";
        //                 command.CommandType = CommandType.StoredProcedure;
        //
        //             // Add parameters
        //             command.Parameters.Add("p_QS_TYPE", OracleDbType.Varchar2)
        //                 .Value = "3";
        //             command.Parameters.Add("p_MOID_NUM", OracleDbType.Varchar2)
        //                 .Value = rkjDto.moidNum;
        //             command.Parameters.Add("p_pid", OracleDbType.Int32).Value =
        //                 xj.Id;
        //                 // Add parameters
        //                 command.Parameters.Add("p_QS_TYPE", OracleDbType.Varchar2)
        //                     .Value = "3";
        //                 command.Parameters.Add("p_MOID_NUM", OracleDbType.Varchar2)
        //                     .Value = rkjDto.moidNum;
        //                 command.Parameters.Add("p_pid", OracleDbType.Int32).Value =
        //                     xj.Id;
        //
        //             command.ExecuteNonQuery();
        //                 command.ExecuteNonQuery();
        //             }
        //
        //             transaction.Commit();
        //         }
        //
        //         transaction.Commit();
        //     }
        //     catch (Exception)
        //     {
        //         transaction.Rollback();
        //         throw;
        //     }
        //         catch (Exception)
        //         {
        //             transaction.Rollback();
        //             throw;
        //         }
        // }

        rkjDto.items = GetItems(xj.Id, null);
@@ -454,42 +600,52 @@
    {
        var db = SqlSugarHelper.GetInstance();

        var id = Convert.ToDecimal(queryObj.id);

        string[]? lineNo = null;

        if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
            lineNo = _baseService.getUserLineNo(queryObj.createUser);

        return db
            .Queryable<QsItemOqcReq, Womdaa, MesItems, MesInvItemIns, Womdab,
                MesInvTransaction, RKJDaa001>(
                (a, da, b, c, d, ca, m) => new JoinQueryInfos(
            .Queryable<QsItemOqcReq, Womdaa, MesItems>((a, da, b) =>
                new JoinQueryInfos(
                    JoinType.Left, da.Daa001 == a.BillNo,
                    JoinType.Left, a.ItemId == b.Id,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left, c.CbillNo == d.Dab001,
                    JoinType.Left,
                    c.TransctionNo == ca.TransactionNo.ToString() &&
                    c.Company == ca.Company && c.Factory == ca.Factory,
                    JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo
                    JoinType.Left, a.ItemId == b.Id
                ))
            .Select((a, da, b, c, d, ca, m) => new QsItemOqcReq
            .WhereIF(lineNo != null && lineNo.Length > 0,
                (a, da, b) => lineNo.Contains(da.Daa015))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, da, b) => a.FcheckResu == null || a.FcheckResu == "")
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, da, b) => a.FcheckResu != null && a.FcheckResu != "")
            .WhereIF(id > 0, (a, da, b) => a.Id == id)
            .Select((a, da, b) => new QsItemOqcReq
            {
                BillNo = a.BillNo,
                Remarks = a.Remarks,
                Id = a.Id,
                CreateDate = a.CreateDate,
                ReleaseNo = a.ReleaseNo,
                CreateBy = a.CreateBy,
                FcheckResu = a.FcheckResu,
                CreateDate = a.CreateDate,
                BillNo = a.BillNo,
                RbillNo = a.RbillNo,
                ItemNo = a.ItemNo,
                ItemId = a.ItemId,
                LineNo = a.LineNo,
                FcheckResu = a.FcheckResu,
                FcheckBy = a.FcheckBy,
                FcheckDate = a.FcheckDate,
                ReleaseNo = a.ReleaseNo,
                // 添加其他字段
                // 如果在 QsItemOqcReq 中定义了额外字段，则需要将它们赋值
                // 例如:
                Remarks = a.Remarks,
                WorkShop = a.WorkShop,
                DepartmentId = a.DepartmentId,
                // 从关联表获取的字段
                ItemName = b.ItemName,
                ItemModel = b.ItemModel,
                TaskNo = c.TaskNo,
                CbillNo = c.CbillNo,
                Dab001 = d.Dab001,
                Daa015 = da.Daa015,
                LineNo = c.LineNo,
                Quantity = m.Quantity
                Quantity = a.Quantity
            }).OrderBy(a => a.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }
@@ -644,4 +800,55 @@

        return Convert.ToInt32(rkjDto.gid);
    }

    /// <summary>
    /// 提交检验单
    /// </summary>
    /// <param name="id">检验单ID</param>
    /// <param name="userNo">提交用户</param>
    /// <returns>更新结果</returns>
    public int SubmitInspection(decimal id, string userNo)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsItemOqcReq>()
                .SetColumns(it => it.Fsubmit == 1) // 设置提交状态为1（已提交）
                .SetColumns(it => it.FcheckBy == userNo) // 设置检验人
                .SetColumns(it => it.FcheckDate == DateTime.Now) // 设置检验时间
                .Where(it => it.Id == id)
                .ExecuteCommand();
        });
    }

    /// <summary>
    /// 刷新检验项目 - 调用存储过程
    /// </summary>
    /// <param name="id">检验单ID</param>
    /// <param name="no">检验单号</param>
    /// <param name="user">用户</param>
    /// <returns>刷新结果</returns>
    public (int result, string message) GenUpdate(decimal? id, string? no, string? user)
    {
        var outputResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000);
        var outputMessage = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, ParameterDirection.Output, 4000);

        var parameters = new List<SugarParameter>
        {
            new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
            new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
            new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
            outputResult,
            outputMessage
        };

        var db = SqlSugarHelper.GetInstance();
        db.Ado.ExecuteCommand(
            "BEGIN PRC_GEN_UPDATE3(:P_ID, :P_NO, :P_USER, :PO_RESULT, :PO_TEXT); END;",
            parameters.ToArray());

        int result = outputResult.Value == null ? -1 : Convert.ToInt32(outputResult.Value);
        string message = outputMessage.Value?.ToString() ?? "";

        return (result, message);
    }
}