From 1b118e5148c0568d7bb64bf59b9a06712c9a6842 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期六, 28 九月 2024 08:12:11 +0800
Subject: [PATCH] 问题修改
---
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 96 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 75 insertions(+), 21 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 91deb8c..2033a79 100644
--- a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
@@ -6,6 +6,7 @@
using Admin.NET.Core.Service;
using AngleSharp.Dom;
+using DocumentFormat.OpenXml.Vml.Office;
using Elastic.Clients.Elasticsearch.Tasks;
using Microsoft.AspNetCore.Http;
using WCS.Application.Entity;
@@ -147,13 +148,13 @@
}
/// <summary>
- /// 鎵嬪姩缁戝畾浠诲姟鍒癙LC
+ /// 鎵嬪姩缁戝畾浠诲姟
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "BindTaskForPLC")]
- [DisplayName("鎵嬪姩缁戝畾浠诲姟鍒癙LC")]
+ [DisplayName("鎵嬪姩缁戝畾浠诲姟")]
public async Task BindTaskForPLC(BindTaskPLCInput input)
{
var deviceInfo = await _wcsDeviceRep.GetByIdAsync(input.deviceId);
@@ -202,15 +203,31 @@
throw Oops.Bah("鎵句笉鍒癙LC淇℃伅");
}
PLCUtil modUtil = new PLCUtil(modPlc);
- var ret= modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
- if (ret.IsSucceed)
+ if (modUtil.Connected)
{
- //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ var ret = modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+ await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ else
+ {
+ throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+ }
+ }
+ else
+ {
+ throw Oops.Bah("PCL鏈繛鎺ワ紝缁戝畾澶辫触锛�");
}
#endregion
}
+ /// <summary>
+ /// 浠诲姟缁撴壒
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "CloseTaskForPLC")]
[DisplayName("浠诲姟缁撴壒")]
@@ -236,24 +253,61 @@
throw Oops.Bah($"鎵句笉鍒板伐浣嶅彿锛歿item.Port} 鐨勮澶囦俊鎭�");
}
PLCUtil modUtil = new PLCUtil(modPlc);
- var ret = modUtil.SetPlcDBValue(item.PosType, item.DbNumber, item.PlcPos, item.PZNo);
- if (ret.IsSucceed)
+ if (modUtil.Connected)
{
- //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
- item.OrderNo = "";
- item.TaskNo = "";
- item.LotNo = "";
- item.SkuNo = "";
- item.SkuName = "";
- item.BoxType = "";
- item.Qty = 0;
- item.PZNo = "";
- item.Status = "0";//鏈粦瀹�
+ var ret = modUtil.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+ item.OrderNo = "";
+ item.TaskNo = "";
+ item.LotNo = "";
+ item.SkuNo = "";
+ item.SkuName = "";
+ item.BoxType = "";
+ item.Qty = 0;
+ item.PZNo = "";
+ item.Status = "0";//鏈粦瀹�
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ //鏇存柊鍒嗘嫞浠诲姟
+ await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ else
+ {
+ throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粨鎵瑰け璐ワ紒");
+ }
}
- #endregion
+ else
+ {
+ throw Oops.Bah("PCL鏈繛鎺ワ紝缁撴壒澶辫触锛�");
+ }
+
+
+ //Service.WcsDevice.Dto.WcsDeviceTaskOrderDto order= await _wcsDeviceRep.Context.Queryable<WcsDevice>()
+ // .InnerJoin<WcsPlc>((device, plc) => device.PlcId == plc.Id)
+ // .LeftJoin<WcsCheckTask>((device, plc, task) => device.StationNum == task.Port)
+ // .Where((device, plc, task) => device.PlcId == 1000 && task.Port=="")
+ // .Select((device, plc, task) => new Service.WcsDevice.Dto.WcsDeviceTaskOrderDto()
+ // {
+ // Id = device.Id,
+ // Text = device.Text,
+ // TaskNo = task.TaskNo,
+ // OrderNo = task.OrderNo,
+ // LotNo = task.LotNo,
+ // SkuNo = task.SkuNo,
+ // SkuName = task.SkuName,
+ // LineNo = task.LineNo,
+ // Status = task.Status,
+ // PZNo = task.PZNo,
+ // Qty = task.Qty,
+
+ // Type = plc.Type
+ // })
+ // .FirstAsync();
+ ////涓嬪彂鍒嗘嫞浠诲姟
+ //HubUtil.PublicCheckTask(order.Adapt<Service.WcsDevice.Dto.WcsDeviceTaskOrderDto>());
+
+ #endregion
}
}
}
--
Gitblit v1.8.0