From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 17 +++++++++++++----
1 files changed, 13 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..f56d5f8 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,15 @@
.Select(s => new WorkPieceProcessOutput
{
Id = s.a.Id,
+
+ JiaJuGongWei = s.a.JiaJuGongWei,
+
+ 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 +495,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