平板入库检、巡检、首检新增销售订单号字段

zyf

2025-08-25 26bccee691f9144e40a32c8a036d779a2d7bf01b

平板入库检、巡检、首检新增销售订单号字段

 MES.Service/Dto/service/SJPageResult.cs

@@ -106,4 +106,7 @@
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NAME")]
    public string? LineName { get; set; }

    //销售订单号
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
}

 MES.Service/Modes/QsQaItemXj.cs

@@ -136,4 +136,5 @@
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
    [SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? CreateUser { get; set; }
    [SugarColumn(IsIgnore = true)] public string? SaleOrder { get; set; }
}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/QC/SJService.cs

@@ -48,7 +48,12 @@
        //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var data = db.Queryable<SJPageResult>()
        var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
                    da,ca) =>
                new JoinQueryInfos(
                    JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 关联工单信息
                    JoinType.Left, da.Daa021 == ca.Caa020//任务单，用于查询销售订单号
                ))
            //.WhereIF(lineNo != null && lineNo.Length > 0,
            //    a => lineNo.Contains(a.line))
            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -62,6 +67,34 @@
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.FSubmit == "1")
            .Select((a, da, ca) => new SJPageResult
            {
                Id = a.Id,
                BillNo = a.BillNo,
                StatusDate = a.StatusDate,
                FName = a.FName,
                Result = a.Result,
                FSubmit = a.FSubmit,
                FSubmitBy = a.FSubmitBy,
                FSubmitDate = a.FSubmitDate,
                MoidNum = a.MoidNum,
                StatusUser = a.StatusUser,
                Pbaid = a.Pbaid,
                CreateTime = a.CreateTime,
                Comments = a.Comments,
                ItemMod = a.ItemMod,
                ItemNo = a.ItemNo,
                daa001 = a.daa001,
                line = a.line,
                Remarks = a.Remarks,
                Daa003 = a.Daa003,
                Daa004 = a.Daa004,
                Daa008 = a.Daa008,
                LineName = a.LineName,

                // 映射额外的字段（销售订单号）
                SaleOrder = ca.Caa015
            })
            .OrderBy(a => a.CreateTime, OrderByType.Desc);
        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);


 MES.Service/service/QC/XJService.cs

@@ -123,12 +123,13 @@

        var query = db
            .Queryable<QsQaItemXj, Womdaa, MesLine,
                MesItems, SysUser>((s, a, c, b, us) =>
                MesItems, SysUser,Womcaa>((s, a, c, b, us,ca) =>
                new JoinQueryInfos(
                    JoinType.Inner, s.BillNo == a.Daa001,
                    JoinType.Left, a.Daa015 == c.LineNo,
                    JoinType.Left, s.ItemId == b.Id,
                    JoinType.Left, us.Fcode == s.CreateBy
                    JoinType.Left, us.Fcode == s.CreateBy,
                    JoinType.Left, ca.Caa020 == a.Daa021
                )
            )
            //.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -142,8 +143,8 @@
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (s, a, c, b, us) => s.SubmitStatus == 1)
            .WhereIF(id > 0, (s, a, c, b, us) => s.Id == id)
            .Select((s, a, c, b, us) => new QsQaItemXj
            .WhereIF(id > 0, (s, a, c, b, us,ca) => s.Id == id)
            .Select((s, a, c, b, us,ca) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
                Id = s.Id,
@@ -159,7 +160,8 @@
                ItemModel = b.ItemModel,
                CheckBy = s.CheckBy,
                CheckResult = s.CheckResult,
                Remarks = s.Remarks
                Remarks = s.Remarks,
                SaleOrder = ca.Caa015 
            }).OrderBy(s => s.CreateDate, OrderByType.Desc);
        var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,
            ref totalCount);

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ