zyf
8 天以前 4787e12bbe2aeeeb362ec724a047a0a734082268
临时提交,修改至巡检按用户所属产线显示
已修改3个文件
26 ■■■■■ 文件已修改
MES.Service/Dto/service/XJPageResult.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/XJService.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/PLM/PLMController.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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; } //用户编码
}
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,
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
            });
        }
    }
}