修复字段类型bug，入库检提交更新结果

zyf

2025-12-04 174707ef5fb6cc8e2b0f973b5f7345e7b89b2d77

 MES.Service/service/QC/RKJService.cs

@@ -2,7 +2,9 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
using SqlSugar;
using SqlSugar.Extensions;

namespace MES.Service.service.QC;

@@ -84,9 +86,14 @@
        if (count <= 0)
            return [];

        decimal? ID = db.Queryable<MesQa>()
            .Where(s => s.QsType == "3" && s.ItemNo == itemNo && s.Fsubmit == 1)
            .Select(s => s.Id)
            .First();

        // 获取质量标准
        var qsItemOqcItems = db.Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "3" && b.ItemNo == itemNo)
            .Where(b => b.QsType == "3" && b.Pid == ID)
            .Select(b => new QsItemOqcItem
            {
                ProjName = b.ProjName,
@@ -522,14 +529,20 @@


        var query = db
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa>((a, b,
                    da, c, us, ca) =>
            .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa,
                SysDepartment, MesUserDepartmentQc, SysUser>((a, b,
                    da, c, us, ca, d, dq, us2) =>
                new JoinQueryInfos(
                    JoinType.Left, a.ItemNo == b.ItemNo, // 关联物料信息
                    JoinType.Left, a.BillNo == da.Daa001, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号
                    JoinType.Left, da.Daa015 == c.LineNo, // 关联工单信息
                    JoinType.Left, us.Fcode == a.CreateBy // 关联工单信息
                    JoinType.Left, us.Fcode == a.CreateBy, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020, //任务单，用于查询销售订单号
                    JoinType.Left,
                    d.Departmentid == Convert.ToDecimal(da.Daa013), //查询车间
                    JoinType.Left,
                    dq.Departmentcode == d.Departmentcode, //查询用户权限
                    JoinType.Left, us2.Fcode == a.FcheckBy
                ))
            // 用户线体过滤条件
            //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
@@ -544,12 +557,18 @@
                (a, b, da, c, us) => a.Fsubmit == 1)
            // 搜索条件（物料名称/编号）
            .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
                (a, b, da, c, us) =>
                (a, b, da, c, us, ca) =>
                    b.ItemName.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    ca.Caa015.ToLower()
                        .Contains(queryObj.SearchValue.ToLower()) ||
                    a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
            // 新增：用户code过滤
            .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser),
                (a, b, da, c, us, ca, d, dq) =>
                    dq.Usercode == queryObj.LoginUser)
            // 查询字段
            .Select((a, b, da, c, us, ca) => new QsItemOqcReq
            .Select((a, b, da, c, us, ca, d, dq, us2) => new QsItemOqcReq
            {
                Id = a.Id,
                BillNo = a.BillNo,
@@ -558,17 +577,19 @@
                ItemModel = b.ItemModel,
                CreateDate = a.CreateDate,
                CreateBy = a.CreateBy,
                CreateUser = us.Fname,
                CreateUser = us.Fname == null ? a.CreateBy : us.Fname,
                FcheckResu = a.FcheckResu,
                FcheckBy = a.FcheckBy,
                FcheckBy = us2.Fname, //a.FcheckBy,
                FcheckDate = a.FcheckDate,
                ReleaseNo = a.ReleaseNo,
                Remarks = a.Remarks,
                Daa015 = da.Daa015, // 工单线体
                Daa015 =
                    d.Departmentname == "注塑车间" ? da.Daa020 : da.Daa015, // 工单线体
                Fsubmit = a.Fsubmit,
                Quantity = da.Daa008,
                LineNo = c.LineName,
                SaleOederNo = ca.Caa015
                LineNo = d.Departmentname == "注塑车间" ? da.Daa020 : c.LineName,
                SaleOrderNo = ca.Caa015,
                DepartName = d.Departmentname
            })
            // 排序
            .OrderBy(a => a.CreateDate, OrderByType.Desc);
@@ -894,12 +915,84 @@

    public int IqcQaSubmit(RKJDto dto)
    {
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                return db.Updateable<QsItemOqcReq>()
                    .SetColumns(a => a.Fsubmit == 1)
                    .SetColumns(a => a.FsubmitBy == dto.userNo)
                    .SetColumns(a => a.FsubmitDate == DateTime.Now)
                    .Where(a => a.ReleaseNo == dto.releaseNo)
                    .ExecuteCommand();
            });

        var P_NO = new SugarParameter("P_NO", dto.releaseNo);

        var db = SqlSugarHelper.GetInstance();
        var FRes = new SugarParameter("c_result", null, true); // 输出参数
        var FMsg = new SugarParameter("c_msg", null, true);

        // 执行存储过程
        db.Ado.UseStoredProcedure().GetDataTable("PRC_RKJ_UPDATE_RESU_JK",P_NO,FRes, FMsg);

        // 获取输出结果
        var Res = Convert.ToInt32(FRes.Value);
        var Msg = FMsg.Value?.ToString();

        Console.WriteLine($"结果: {Res}, 返回消息: {Msg}");

        if ( Res == 1 )
        {
            throw new Exception(Msg);
        }

        if (useTransactionWithOracle > 0)
        {
            
            // 成功提交后推送钉钉消息
            var qaRkj = db.Queryable<QaRkj>()
                .Where(s => s.ReleaseNo == dto.releaseNo)
                .First();

            if (qaRkj != null)
            {
                try
                {
                    var qaMsgDto = new
                    {
                        id = qaRkj.Id,
                        lineName = qaRkj.Daa020,
                        workshopName = qaRkj.Departmentname,
                        qaType = "入库检检验完成"
                    };

                    // 调用钉钉消息推送接口
                    var client = new System.Net.Http.HttpClient();
                    var json = Newtonsoft.Json.JsonConvert.SerializeObject(qaMsgDto);
                    var content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");
                    var response = client.PostAsync("http://192.168.0.100:9096/MesQaDingtalk/sendQaMsgRKJ", content).Result;
                }
                catch (Exception ex)
                {
                    // 记录钉钉推送异常，但不影响主流程
                    Console.WriteLine($"钉钉消息推送失败: {ex.Message}");
                }
            }
        }



        return useTransactionWithOracle;
    }

    public int reSubmit(RKJDto dto)
    {
        SqlSugarHelper.UseTransactionWithOracle(db =>
        {
           return db.Updateable<QsItemOqcReq>()
                .SetColumns(a => a.Fsubmit == 1)
                .SetColumns(a => a.FsubmitBy == dto.userNo)
                .SetColumns(a => a.FsubmitDate == DateTime.Now)
            return db.Updateable<QsItemOqcReq>()
                .SetColumns(a => a.Fsubmit == 0)
                .SetColumns(a => a.FsubmitBy == null)
                .SetColumns(a => a.FsubmitDate == null)
                .Where(a => a.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });