From f44c5df9cc045644982f578fb0b3c3e60b88eb68 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 九月 2024 18:54:17 +0800
Subject: [PATCH] 修改分拣任务读取
---
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 91deb8c..154209a 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);
@@ -211,6 +212,11 @@
#endregion
}
+ /// <summary>
+ /// 浠诲姟缁撴壒
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "CloseTaskForPLC")]
[DisplayName("浠诲姟缁撴壒")]
@@ -253,6 +259,31 @@
//鏇存柊鍒嗘嫞浠诲姟
await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
+
+ //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