From bfc55b7990a290d9f05eaaaa0e4081fb84f5264c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=96=8C?= <1324361213@qq.com> Date: Sat, 23 Aug 2025 18:22:55 +0800 Subject: [PATCH] 0 --- .../LxmZHMDReport/PrdMoOrderEntryResp.cs | 43 ++++++++++++ .../MyCode.Project.Domain.csproj | 1 + .../Repositories/IMOOrdersRepository.cs | 22 +++++-- .../MOOrdersRepository.cs | 65 ++++++++++++++++--- .../IServices/IPrdOrderService.cs | 10 ++- .../Implementation/PrdOrderService.cs | 8 ++- .../Controllers/PrdMoController.cs | 50 ++++++++++++++ .../MyCode.Project.WebApi.csproj | 1 + 8 files changed, 182 insertions(+), 18 deletions(-) create mode 100644 Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs create mode 100644 Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs new file mode 100644 index 0000000..c17386c --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport +{ + /// + /// 生产订单大屏数据 + /// + public class PrdMoOrderEntryResp + { + /// + /// 生产订单分录行号 + /// + public int Seq { get; set; } + + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + + /// + /// 生产车间 + /// + public string DeptName { get; set; } + + /// + /// 数量 + /// + public decimal Qty { get; set; } + + /// + /// 入库总、数量 + /// + public decimal InStockQty { get; set; } + /// + /// 业务状态 + /// + public string MoStatus { get; set; } + } +} diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 16af0de..78b093e 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -68,6 +68,7 @@ + diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs index c49fd09..7a21e00 100644 --- a/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs @@ -1,14 +1,15 @@ -using System; +using MyCode.Project.Domain; +using MyCode.Project.Domain.Message; +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Domain.Model; +using MyCode.Project.Infrastructure; +using MyCode.Project.Infrastructure.Common; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using MyCode.Project.Infrastructure; -using MyCode.Project.Domain; -using MyCode.Project.Domain.Model; -using MyCode.Project.Infrastructure.Common; -using MyCode.Project.Domain.Message; -using MyCode.Project.Domain.Message.Response.LxmZHMDReport; namespace MyCode.Project.Domain.Repositories { @@ -23,5 +24,12 @@ namespace MyCode.Project.Domain.Repositories /// PageResult GetPrdMoPageList(PagedSearch search); + + /// + /// 获取生产订单分录信息 + /// + /// + /// + PageResult GetPrdMoEntryPageList(PagedSearch search); } } diff --git a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs index bbf66bb..63d5768 100644 --- a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs @@ -1,15 +1,16 @@ -using MyCode.Project.Repositories.Common; +using MyCode.Project.Domain.Message; +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Domain.Model; +using MyCode.Project.Domain.Repositories; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Search; +using MyCode.Project.Repositories.Common; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using MyCode.Project.Domain.Message; -using MyCode.Project.Domain.Model; -using MyCode.Project.Domain.Repositories; -using MyCode.Project.Infrastructure.Common; -using MyCode.Project.Infrastructure.Search; -using MyCode.Project.Domain.Message.Response.LxmZHMDReport; namespace MyCode.Project.Repositories { @@ -17,10 +18,56 @@ namespace MyCode.Project.Repositories { public MOOrdersRepository(MyCodeSqlSugarClient context) : base(context) { } + /// + /// 查询生产订单表体 + /// + /// + /// + public PageResult GetPrdMoEntryPageList(PagedSearch search) + { + SearchCondition where = new SearchCondition(); + where.AddSqlCondition($"t1e.FID={search.Condition.Id} ", true); + string sql = $@" +SELECT + t1e.FSEQ Seq, + tm_l.FNAME MaterialName, + t2_l.FNAME DeptName, + t1e.FQTY Qty, + t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY InStockQty, + CASE + WHEN t1e_a.FSTATUS = 1 THEN '计划' + WHEN t1e_a.FSTATUS = 2 THEN '计划确认' + WHEN t1e_a.FSTATUS = 3 THEN '下达' + WHEN t1e_a.FSTATUS = 4 THEN '开工' + WHEN t1e_a.FSTATUS = 5 THEN '完工' + WHEN t1e_a.FSTATUS = 6 THEN '结案' + WHEN t1e_a.FSTATUS = 7 THEN '结算' + ELSE '' + END MoStatus +FROM + T_PRD_MOENTRY t1e + LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID + LEFT JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID + LEFT JOIN T_BD_MATERIAL_L tm_l ON tm_l.FMATERIALID = tm.FMATERIALID + AND tm_l.FLOCALEID = 2052 + LEFT JOIN T_BD_DEPARTMENT t2 ON t1e.FWORKSHOPID = t2.FDEPTID + LEFT JOIN T_BD_DEPARTMENT_L t2_l ON t2.FDEPTID = t2_l.FDEPTID + AND t2_l.FLOCALEID = 2052 + +"; + + + var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"SEQ desc "); + return list; + } - + /// + /// 查询生产订单表头 + /// + /// + /// public PageResult GetPrdMoPageList(PagedSearch search) { SearchCondition where = new SearchCondition(); @@ -59,6 +106,6 @@ FROM return list; } - + } } \ No newline at end of file diff --git a/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs index c2ead08..b9df1bc 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs @@ -1,4 +1,5 @@ -using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.JackYun; @@ -13,5 +14,12 @@ namespace MyCode.Project.Services /// PageResult GetPrdMoPageList(PagedSearch search); + /// + /// 获取生产订单明细列表数据 + /// + /// + /// + PageResult GetPrdMoEntryPageList(PagedSearch search); + } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs index 6e318af..349eb1f 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs @@ -1,4 +1,5 @@ -using MyCode.Project.Domain.Message.Request.JackYun; +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Request.JackYun; using MyCode.Project.Domain.Message.Response.LxmZHMDReport; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; @@ -18,6 +19,11 @@ namespace MyCode.Project.Services.Implementation _MOOrdersRepository = MOOrdersRepository; } + public PageResult GetPrdMoEntryPageList(PagedSearch search) + { + return _MOOrdersRepository.GetPrdMoEntryPageList(search); + } + /// /// 生产订单列表 /// diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs new file mode 100644 index 0000000..1d167cb --- /dev/null +++ b/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs @@ -0,0 +1,50 @@ +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Services; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; + +namespace MyCode.Project.WebApi.Controllers +{ + /// + /// 生产订单 + /// + public class PrdMoController : BaseAPIController + { + private IPrdOrderService _prdOrderService; + /// + /// 生产订单 + /// + public PrdMoController(IPrdOrderService prdOrderService) + { + _prdOrderService = prdOrderService; + } + + + /// + /// 获取生产订单 + /// + [AllowAnonymous] + [HttpPost] + public PageResult GetMoRespData(PagedSearch pagedSearch) + { + return _prdOrderService.GetPrdMoPageList(pagedSearch); + } + + /// + /// 获取生产订单 + /// + [AllowAnonymous] + [HttpPost] + + public PageResult GetMoEntryRespData(PagedSearch search) + { + return _prdOrderService.GetPrdMoEntryPageList(search); + } + } +} diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj index 2b49b49..5fa0114 100644 --- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj +++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj @@ -209,6 +209,7 @@ + Global.asax