From cba0d7d86eaa48f56173ac33ab3ac537c637f02e Mon Sep 17 00:00:00 2001 From: chenlin Date: Mon, 26 Jan 2026 17:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B7=A5=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MES/product/ProWorkorderController.cs | 18 ++++++++++++++++++ DOAN.Model/MES/product/Dto/ProWorkorderDto.cs | 14 ++++++++++++++ .../product/IService/IProWorkorderService.cs | 2 ++ .../MES/product/ProWorkorderService.cs | 19 +++++++++++++++---- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs index 59b8bcd..ac66e36 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs @@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Http; using Aliyun.OSS; using System; using DOAN.Infrastructure; +using Microsoft.IdentityModel.Tokens; //创建时间:2024-07-16 namespace DOAN.Admin.WebApi.Controllers @@ -192,6 +193,23 @@ namespace DOAN.Admin.WebApi.Controllers return SUCCESS(response); } + /// + /// 设置工单状态:1 init,2 start 3 end 4pause + /// + /// + /// + [HttpPost("setWorkorderStatus")] + [Log(Title = "设置工单状态", BusinessType = BusinessType.UPDATE)] + public IActionResult SetWorkorderStatus(ProWorkorderStatusDto param) + { + if (string.IsNullOrEmpty(param.Id)) + { + return SUCCESS(null); + } + var response = _ProWorkorderService.SetWorkorderStatus(param); + return SUCCESS(response); + } + /// /// 生产工单导入模板下载 workorder 启用(9/14) /// diff --git a/DOAN.Model/MES/product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/product/Dto/ProWorkorderDto.cs index fa2b4f2..e4fae72 100644 --- a/DOAN.Model/MES/product/Dto/ProWorkorderDto.cs +++ b/DOAN.Model/MES/product/Dto/ProWorkorderDto.cs @@ -259,6 +259,20 @@ namespace DOAN.Model.MES.product.Dto /// public string IsMatch_Unit { get; set; } } + + public class ProWorkorderStatusDto + { + /// + /// 工单id + /// + public string Id { get; set; } + + /// + /// 工单状态 + /// + public int Status { get; set; } + } + /// /// 工单BOM 及其所需数量 /// diff --git a/DOAN.Service/MES/product/IService/IProWorkorderService.cs b/DOAN.Service/MES/product/IService/IProWorkorderService.cs index 0dc3dc9..7137f5a 100644 --- a/DOAN.Service/MES/product/IService/IProWorkorderService.cs +++ b/DOAN.Service/MES/product/IService/IProWorkorderService.cs @@ -38,6 +38,8 @@ namespace DOAN.Service.MES.product.IService int MoveWorkorder(string id, int type); + int SetWorkorderStatus(ProWorkorderStatusDto param); + int ImportData(IFormFile formFile,string username); diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs index e85a25a..d641782 100644 --- a/DOAN.Service/MES/product/ProWorkorderService.cs +++ b/DOAN.Service/MES/product/ProWorkorderService.cs @@ -417,13 +417,24 @@ namespace DOAN.Service.MES.product result += Context.Updateable(exchange).ExecuteCommand(); } - - - return result; - } + /// + /// 设置工单状态:1 init,2 start 3 end 4pause + /// + /// + /// + /// + public int SetWorkorderStatus(ProWorkorderStatusDto param) + { + return Context.Updateable() + .SetColumns(it => it.Status == param.Status) + .SetColumns(it => it.UpdatedTime == DateTime.Now) + .Where(it => it.Id == param.Id).ExecuteCommand(); + } + + /// /// 导入工单 必须整删除 整改