From 75acb15fd7a801d06a44f8306a27a5a15b33d9e4 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 11 9月 2024 19:16:16 +0800 Subject: [PATCH] 2 --- iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs index 699af9d..f5a2fc7 100644 --- a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs +++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs @@ -239,6 +239,13 @@ .Select(s => new WorkPieceProcessOutput { Id = s.a.Id, + + DataCapturePointCname = s.a.DataCapturePointCname, + UpdateDataCapturePointCname = s.a.UpdateDataCapturePointCname, + QualityNoOkReason = s.a.QualityNoOkReason, + CreateUserName = s.a.CreatedUserName, + UpdatedUserName = s.a.UpdatedUserName, + WorkPieceID = s.a.WorkPieceID, WorkingProcedureCurrent = s.a.WorkingProcedureCurrent, EquipmentID = s.a.EquipmentID, @@ -486,10 +493,10 @@ public async Task<string> outBoundWorkPiece([FromBody] OutBoundInput input) { - if (input.Password == null || !input.Password.Equals("123456")) - { - throw Oops.Oh("淇敼宸ヤ欢璐ㄩ噺鐘舵�佸け璐ワ細瀵嗙爜杈撳叆閿欒锛�"); - } + //if (input.Password == null || !input.Password.Equals("123456")) + //{ + // throw Oops.Oh("淇敼宸ヤ欢璐ㄩ噺鐘舵�佸け璐ワ細瀵嗙爜杈撳叆閿欒锛�"); + //} if (input.WorkPieceInfoLst.Count < 1) { throw Oops.Oh("宸ヤ欢鍏ュ簱澶辫触锛氭暟鎹笉鑳戒负绌猴紒"); -- Gitblit v1.9.3