From 45bfff43e197116a28c9f5bba91690a2b189b5bc Mon Sep 17 00:00:00 2001 From: quowingwang Date: Thu, 18 Dec 2025 14:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pro/ProWorkorderV2Controller.cs | 10 +++ .../2025年51周5日计划-12-18-141250.xlsx | Bin 0 -> 31896 bytes ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs | 17 +++++ .../pro/IService/IProWorkorderServiceV2.cs | 4 +- ZR.Service/mes/pro/ProWorkorderServiceV2.cs | 67 +++++++++++++++++- 5 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 ZR.Admin.WebApi/wwwroot/export/2025年51周5日计划-12-18-141250.xlsx diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index 3676c8c2..6707adde 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -382,6 +382,16 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro return ToResponse(new ApiResult(200, "success", data)); } + /// + /// 获取1000条工单的状态工单列表 + /// + [HttpGet("getWorkoderStates")] + public ApiResult getWorkoderStates(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1) + { + ApiResult apiResult = proWorkorderService.getWorkoderStates(pageNum, pageSize, year, week, date, 0); + + return apiResult; + } } diff --git a/ZR.Admin.WebApi/wwwroot/export/2025年51周5日计划-12-18-141250.xlsx b/ZR.Admin.WebApi/wwwroot/export/2025年51周5日计划-12-18-141250.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d5adef2cc5c032e4c29c05d152dfbd890bf391d7 GIT binary patch literal 31896 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 literal 0 HcmV?d00001 diff --git a/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs index f17e3ceb..5848e9db 100644 --- a/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs +++ b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs @@ -146,4 +146,21 @@ namespace ZR.Model.DTO.MES.pro /// public DateTime UpdatedTime { get; set; } } + + public class ProWorkorderV2Dto_stateCount + { + public int total { get; set; } = 0; + //正常 + public int state0 { get; set; } + //物料不存在 + public int state1 { get; set; } + //毛坯号异常 + public int state2 { get; set; } + //颜色异常 + public int state3 { get; set; } + //规格异常 + public int state4 { get; set; } + //物料不包含此描述 + public int state5 { get; set; } + } } \ No newline at end of file diff --git a/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs b/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs index 65c3e750..46884d52 100644 --- a/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs @@ -1,4 +1,5 @@ -using ZR.Model.MES.pro; +using Infrastructure.Model; +using ZR.Model.MES.pro; using ZR.Model.MES.pro.DTO; namespace ZR.Service.mes.pro.IService @@ -10,6 +11,7 @@ namespace ZR.Service.mes.pro.IService public (List, int) GetWorkorderList(int pageNum, int pageSize, int year, int week, int date, int isSchedule); public (List, int) GetWorkorderList_Piliang(int pageNum, int pageSize, int year, int week, int date, int isSchedule); + public ApiResult getWorkoderStates(int pageNum, int pageSize, int year, int week, int date, int isSchedule); public string ImportExceldata(List proWorklplans); diff --git a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs index 42839e5a..16f00f70 100644 --- a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs @@ -1,11 +1,14 @@ -using System; -using System.IO; -using Infrastructure; +using Infrastructure; using Infrastructure.Attribute; +using Infrastructure.Model; using Microsoft.AspNetCore.Hosting; using MiniExcelLibs; using Model.DBModel; using SqlSugar; +using System; +using System.IO; +using ZR.Model.DTO.MES.pro; +using ZR.Model.mes.pro; using ZR.Model.MES.pro; using ZR.Model.MES.pro.DTO; using ZR.Model.MES.wms; @@ -106,6 +109,64 @@ namespace ZR.Service.mes.pro return (proWorkorderList, totalCount); } + /// + /// 获取1000条数据生产计划状态 + /// + /// + /// + /// + /// + /// + /// + /// + public ApiResult getWorkoderStates(int pageNum, int pageSize, int year, int week, int date, int isSchedule) + { + try + { + ApiResult result = new ApiResult(); + var predicate = Expressionable + .Create() + .AndIF(year > 0, it => it.Year == year) + .AndIF(week > 0, it => it.Week == week) + .AndIF(date > 0, it => it.Date == date) + .ToExpression(); + + int totalCount = 0; + List proWorkorderList = Context + .Queryable() + .Where(predicate) + .OrderBy(it => it.Sort) + .ToPageList(pageNum, pageSize, ref totalCount); + ProWorkorderV2Dto_stateCount pcount = new ProWorkorderV2Dto_stateCount(); + if (proWorkorderList != null) + { + foreach (var item in proWorkorderList) + { + int State = CheckWorkOrder(item); + pcount.total++; + switch (State) + { + case 0: pcount.state0++; break; + case 1: pcount.state1++; break; + case 2: pcount.state2++; break; + case 3: pcount.state3++; break; + case 4: pcount.state4++; break; + case 5: pcount.state5++; break; + } + } + } + result.Success().Data = pcount; + return result; + } + catch (Exception ex) + { + ApiResult result = new ApiResult(); + result.Code = 101; + result.Msg = ex.Message; + return result; + } + } + /// /// 获取生产计划id ///