From a4f725f0fc99e1e51106af1b60263ac3bd2a7c30 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期二, 13 八月 2024 10:09:14 +0800
Subject: [PATCH] 合并上格新增代码
---
MES.Service/service/QC/XJService.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 5513747..7c35c43 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/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);
}
--
Gitblit v1.9.3