合并上格新增代码

展杰

2024-08-13 a4f725f0fc99e1e51106af1b60263ac3bd2a7c30

 MES.Service/service/QC/XJService.cs

@@ -64,7 +64,7 @@
                BoardModel = b.BoardModel,
                PlanQty = c.PlanQty,
                Mocode = a.Mocode,
                BoardStyle = c.BoardStyle,
                // BoardStyle = c.BoardStyle,
                Id = a.Id
            })
            .ToList();
@@ -156,7 +156,7 @@
                CatQty = a.CatQty,
                MoidNum = s.MoidNum,
                Daa020 = a.LineNo,
                DetailMem = a.DetailMem,
                // DetailMem = a.DetailMem,
                TaskNo = a.TaskNo,
                Id = s.Id,
                CreateBy = s.CreateBy,
@@ -169,9 +169,9 @@
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks,
                BoardModel = b.BoardModel,
                PlanQty = c.PlanQty,
                Mocode = a.Mocode,
                BoardStyle = c.BoardStyle
                PlanQty = c.PlanQty
                // Mocode = a.Mocode,
                // BoardStyle = c.BoardStyle
            }).OrderBy(s => s.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }