diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs index a368c52..3e355b6 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs @@ -41,5 +41,13 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport /// 下单时间 /// public DateTime FCreateDate { get; set; } + /// + /// 物料名称 + /// + public string MaterialNames { get; set; } + /// + /// 生产车间 + /// + public string Department { get; set; } } } diff --git a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs index d1a8f7b..4b1d334 100644 --- a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs @@ -79,26 +79,64 @@ SELECT FROM ( SELECT - t1.FID Fid, - t1.FBILLNO FBillNo, - t1.FDATE FDate, - t1.FCREATEDATE FCreateDate, - SUM(t1e.FQTY) Qty, - SUM( - t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY - ) InStockQty - FROM - T_PRD_MO t1 - LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID - LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID - WHERE - 1 = 1 - AND t1.FDOCUMENTSTATUS = 'C' - GROUP BY - t1.FID, - t1.FBILLNO, - t1.FDATE, - t1.FCREATEDATE + t1.FID Fid, + t1.FBILLNO FBillNo, + t1.FDATE FDate, + t1.FCREATEDATE FCreateDate, + SUM(t1e.FQTY) Qty, + SUM( + t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY + ) InStockQty, + ISNULL ( + stuff ( + ( + select distinct + ';' + tm_l.FNAME + from + T_PRD_MOENTRY tt + INNER JOIN T_BD_MATERIAL tm ON tt.FMATERIALID = tm.FMATERIALID + LEFT JOIN T_BD_MATERIAL_L tm_l ON tm.FMATERIALID = tm_l.FMATERIALID + AND tm_l.FLOCALEID = 2052 + where + tt.FID = t1.FID for xml path ('') + ), + 1, + 1, + '' + ), + '' + ) MaterialNames, + ISNULL ( + stuff ( + ( + select distinct + ';' + tm_l.FNAME + from + T_PRD_MOENTRY tt + INNER JOIN T_BD_DEPARTMENT tm ON tt.FWORKSHOPID = tm.FDEPTID + LEFT JOIN T_BD_DEPARTMENT_L tm_l ON tm.FDEPTID = tm_l.FDEPTID + AND tm_l.FLOCALEID = 2052 + where + tt.FID = t1.FID for xml path ('') + ), + 1, + 1, + '' + ), + '' + ) Department +FROM + T_PRD_MO t1 + LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID + LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID +WHERE + 1 = 1 + AND t1.FDOCUMENTSTATUS = 'C' +GROUP BY + t1.FID, + t1.FBILLNO, + t1.FDATE, + t1.FCREATEDATE ) t1Temp "; diff --git a/Reportapi/MyCode.Project.WebApi/bin.zip b/Reportapi/MyCode.Project.WebApi/bin.zip new file mode 100644 index 0000000..693dbd1 Binary files /dev/null and b/Reportapi/MyCode.Project.WebApi/bin.zip differ