From 4787e12bbe2aeeeb362ec724a047a0a734082268 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 26 八月 2025 13:57:42 +0800
Subject: [PATCH] 临时提交，修改至巡检按用户所属产线显示
---
MES.Service/service/QC/XJService.cs | 5 +++--
MES.Service/Dto/service/XJPageResult.cs | 1 +
MESApplication/Controllers/PLM/PLMController.cs | 20 ++++++++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
index 09cc6c5..0920893 100644
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ b/MES.Service/Dto/service/XJPageResult.cs
@@ -10,4 +10,5 @@
public string? id { get; set; }
public string? SearchValue { get; set; }
+ public string? statusUser { get; set; } //鐢ㄦ埛缂栫爜
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 0ae4b41..5a900e3 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -123,13 +123,14 @@
var query = db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems, SysUser,Womcaa>((s, a, c, b, us,ca) =>
+ MesItems, SysUser,Womcaa,SysDepartment>((s, a, c, b, us,ca,d) =>
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, ca.Caa020 == a.Daa021
+ JoinType.Left, ca.Caa020 == a.Daa021,
+ JoinType.Left, d.Departmentcode == c.Departmentcode
)
)
//.WhereIF(lineNo != null && lineNo.Length > 0,
diff --git a/MESApplication/Controllers/PLM/PLMController.cs b/MESApplication/Controllers/PLM/PLMController.cs
index a20d80b..bc17a91 100644
--- a/MESApplication/Controllers/PLM/PLMController.cs
+++ b/MESApplication/Controllers/PLM/PLMController.cs
@@ -122,4 +122,24 @@
});
}
}
+ //RetrieveDrawings 璋冨彇鍥剧焊
+ [HttpGet("OpenDrawingsGet")]
+ public IActionResult OpenDrawingsGet(string fileId, string fName)
+ {
+ try
+ {
+ var resultInfos = wdd.SendRequest("Download", fileId);
+
+ return File(resultInfos, "application/octet-stream", fName);
+ }
+ catch (Exception ex)
+ {
+ return StatusCode(500, new ResponseResult
+ {
+ status = 1,
+ message = ex.Message,
+ data = null
+ });
+ }
+ }
}
--
Gitblit v1.9.3