From 639a8988f5b25cb04c958e524b711dd68670e193 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 24 Nov 2023 09:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=9B=BE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/mes/pro/ProWorkorderController.cs | 2 +- ZR.Service/mes/pro/ProWorkorderService.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs index 3fbfb0cc..b074b93e 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs @@ -94,7 +94,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro /// - /// 下达生产指令 + /// 下达开始领料指令 /// /// 工单ID /// diff --git a/ZR.Service/mes/pro/ProWorkorderService.cs b/ZR.Service/mes/pro/ProWorkorderService.cs index 86162dad..4640788a 100644 --- a/ZR.Service/mes/pro/ProWorkorderService.cs +++ b/ZR.Service/mes/pro/ProWorkorderService.cs @@ -26,7 +26,8 @@ namespace ZR.Service.mes.pro .AndIF(year > 0, it => it.Year == year) .AndIF(week > 0, it => it.Week == week) .AndIF(date > 0, it => it.Date == date) - .And(it => it.Wrokerorder_status.Equals(isSchedule)) + .AndIF(isSchedule==0,it => it.Wrokerorder_status.Equals(isSchedule)) + .AndIF(isSchedule>=1,it => it.Wrokerorder_status>=1) .ToExpression(); int totalCount = 0; @@ -78,7 +79,7 @@ namespace ZR.Service.mes.pro public int ReleaseProduction(string id) { return Context.Updateable() - .SetColumns(it => it.Wrokerorder_status == 1) + .SetColumns(it => it.Wrokerorder_status == 2) .Where(it => it.Id.Equals(id)) .ExecuteCommand(); }