From 9c4d9f98c100f8f891f60d0706dd3d4111eeaebd Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 14 二月 2025 08:52:45 +0800
Subject: [PATCH] 修改数据库配置，增加PLC入库前信号交互
---
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 184 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 28 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 5d9c864..16421c2 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;
@@ -40,12 +41,12 @@
[DisplayName("鍒嗛〉鏌ヨ鍒嗘嫞浠诲姟琛�")]
public async Task<SqlSugarPagedList<WcsCheckTaskOutput>> Page(PageWcsCheckTaskInput input)
{
- input.SearchKey = input.SearchKey?.Trim();
+ input.SearchKey = input.SearchKey?.Trim();
var query = _wcsCheckTaskRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.OrderNo.Contains(input.SearchKey)
|| u.RoboatNo.Contains(input.SearchKey)
- || u.LineNO.Contains(input.SearchKey)
+ || u.LineNo.Contains(input.SearchKey)
|| u.Port.Contains(input.SearchKey)
|| u.LotNo.Contains(input.SearchKey)
|| u.SkuNo.Contains(input.SearchKey)
@@ -57,7 +58,7 @@
)
.WhereIF(!string.IsNullOrWhiteSpace(input.OrderNo), u => u.OrderNo.Contains(input.OrderNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.RoboatNo), u => u.RoboatNo.Contains(input.RoboatNo.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.LineNO), u => u.LineNO.Contains(input.LineNO.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.LineNo), u => u.LineNo.Contains(input.LineNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Port), u => u.Port.Contains(input.Port.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.LotNo), u => u.LotNo.Contains(input.LotNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.SkuNo), u => u.SkuNo.Contains(input.SkuNo.Trim()))
@@ -66,14 +67,14 @@
.WhereIF(!string.IsNullOrWhiteSpace(input.Status), u => u.Status.Contains(input.Status.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PZNo), u => u.PZNo.Contains(input.PZNo.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
- .WhereIF(input.BoxInsert>0, u => u.BoxInsert == input.BoxInsert)
- .WhereIF(input.BoxCount>0, u => u.BoxCount == input.BoxCount)
- .WhereIF(input.Qty>0, u => u.Qty == input.Qty)
- .WhereIF(input.FinishQty>0, u => u.FinishQty == input.FinishQty)
+ .WhereIF(input.BoxInsert > 0, u => u.BoxInsert == input.BoxInsert)
+ .WhereIF(input.BoxCount > 0, u => u.BoxCount == input.BoxCount)
+ .WhereIF(input.Qty > 0, u => u.Qty == input.Qty)
+ .WhereIF(input.FinishQty > 0, u => u.FinishQty == input.FinishQty)
.WhereIF(input.BindTimeRange != null && input.BindTimeRange.Length == 2, u => u.BindTime >= input.BindTimeRange[0] && u.BindTime <= input.BindTimeRange[1])
- .WhereIF(input.BindUserId>0, u => u.BindUserId == input.BindUserId)
+ .WhereIF(input.BindUserId > 0, u => u.BindUserId == input.BindUserId)
.Select<WcsCheckTaskOutput>();
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -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);
@@ -190,34 +191,161 @@
checkTaskInfo.LotNo = taskInfo.LotNo;
checkTaskInfo.SkuNo = taskInfo.SkuNo;
checkTaskInfo.SkuName = taskInfo.SkuName;
- checkTaskInfo.BoxType = taskInfo.BoxType;
+ //checkTaskInfo.BoxType = taskInfo.BoxType;
checkTaskInfo.Qty = taskInfo.Qty;
checkTaskInfo.Status = "1";//宸茬粦瀹�
checkTaskInfo.PZNo = skuInfo.PZNo;
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+
+ #region#缁橮LC鍐欏叆鎶撶鍝佺鍙�
+ if (checkTaskInfo.Id >= 6)
+ {
+ var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
+ if (modPlc == null)
+ {
+ throw Oops.Bah("鎵句笉鍒癙LC淇℃伅");
+ }
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ if (modUtil.Connected)
+ {
+ 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鏈繛鎺ワ紝缁戝畾澶辫触锛�");
+ }
+ }
+ else
+ {
+ await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ #endregion
}
+ /// <summary>
+ /// 浠诲姟寮哄埗缁撴壒
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "CloseTaskForPLC")]
- [DisplayName("浠诲姟缁撴壒")]
- public async Task CloseTaskForPLC(BindTaskPLCInput input)
+ [DisplayName("浠诲姟寮哄埗缁撴壒")]
+ public async Task CloseTaskForPLC(CloseTaskPLCInput input)
{
- #region 璇锋眰PLC鎺ュ彛
- #endregion
- //鍒嗘嫞浠诲姟淇℃伅
+ // 娉ㄩ噴锛氭紨绀烘ā寮忎笉缁戝畾鍒嗛亾銆俵iudl 2024-10-30
+ //if (PLCTaskAction.boDemo)
+ //{
+ // //婕旂ず妯″紡
+ // var checkTaskList2 = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().FirstAsync(w => w.Port == "208");
+
+ // var deviceInfo = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(w => w.StationNum == "208");
+ // if (deviceInfo == null)
+ // {
+ // throw Oops.Bah($"鎵句笉鍒板伐浣嶅彿锛�208鐨勭爜鍨涘伐浣嶄俊鎭�");
+ // }
+ // var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
+ // if (modPlc == null)
+ // {
+ // throw Oops.Bah($"鎵句笉鍒板伐浣嶅彿锛�208鐨勮澶囦俊鎭�");
+ // }
+ // PLCUtil modUtil = new PLCUtil(modPlc);
+
+ // var ret = modUtil.SetPlcDBValue(checkTaskList2.PosTypeLot, checkTaskList2.DbNumber, checkTaskList2.PosLot, "1");
+ // return;
+ //}
+
+ // 姝ｅ父妯″紡
+ if (string.IsNullOrWhiteSpace(input.lotNo))
+ {
+ throw Oops.Bah($"璇ュ伐浣嶆湭缁戝畾浠诲姟锛�");
+ }
var checkTaskList = _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.LotNo == input.lotNo && w.Status == "1").ToList();
+ if (checkTaskList.Count <= 0)
+ {
+ throw Oops.Bah("鎵句笉鍒拌鎵规鍒嗘嫞浠诲姟淇℃伅");
+ }
foreach (var item in checkTaskList)
{
- item.OrderNo = "";
- item.LotNo = "";
- item.SkuNo = "";
- item.SkuName = "";
- item.BoxType = "";
- item.Qty = 0;
- item.Status = "0";//鏈粦瀹�
+ #region#缁橮LC鍐欏叆缁撴壒鎵规鍙�
+ var deviceInfo = await _wcsDeviceRep.Context.Queryable<WcsDevice>().FirstAsync(w => w.StationNum == item.Port);
+ if (deviceInfo == null)
+ {
+ throw Oops.Bah($"鎵句笉鍒板伐浣嶅彿锛歿item.Port} 鐨勭爜鍨涘伐浣嶄俊鎭�");
+ }
+ var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
+ if (modPlc == null)
+ {
+ throw Oops.Bah($"鎵句笉鍒板伐浣嶅彿锛歿item.Port} 鐨勮澶囦俊鎭�");
+ }
+ PLCUtil modUtil = new PLCUtil(modPlc);
+ if (modUtil.Connected)
+ {
+ // 鍐欏叆缁撴壒淇″彿
+ var ret = modUtil.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
+ //var ret1 = modUtil.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "0"); // 瑙ｇ粦鍒嗛亾
+ //if (ret1.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();
+ //}
+ //else
+ //{
+ // throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粨鎵瑰け璐ワ紒");
+ //}
+ }
+ else
+ {
+ throw Oops.Bah("PCL鏈繛鎺ワ紝缁撴壒澶辫触锛�");
+ }
+ #endregion
}
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskList).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
+ /// <summary>
+ /// 浠诲姟瑙ｇ粦
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "UnBindTaskForPLC")]
+ [DisplayName("浠诲姟瑙ｇ粦")]
+ public async Task UnBindTaskForPLC(BaseIdInput input)
+ {
+ var modCheckTask = await _wcsCheckTaskRep.AsQueryable().FirstAsync(s => s.Id == input.Id);
+ if (modCheckTask == null)
+ throw Oops.Bah("鎵句笉鍒拌淇℃伅");
+ if (modCheckTask.Status != "1")
+ throw Oops.Bah("璇ヤ换鍔″凡瑙ｇ粦");
+ modCheckTask.Status = "0";
+ modCheckTask.OrderNo = "";
+ modCheckTask.TaskNo = "";
+ modCheckTask.SkuNo = "";
+ modCheckTask.SkuName = "";
+ modCheckTask.LotNo = "";
+ modCheckTask.PZNo = "";
+ modCheckTask.BoxType = "";
+ modCheckTask.Qty = 0;
+
+ await _wcsCheckTaskRep.AsUpdateable(modCheckTask).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+
+
}
}
--
Gitblit v1.8.0