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 | 175 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 118 insertions(+), 57 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 154209a..16421c2 100644
--- a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
@@ -41,7 +41,7 @@
[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)
@@ -67,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>
@@ -191,38 +191,82 @@
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;
+ checkTaskInfo.PZNo = skuInfo.PZNo;
#region#缁橮LC鍐欏叆鎶撶鍝佺鍙�
- var modPlc = await _wcsDeviceRep.Context.Queryable<WcsPlc>().FirstAsync(s => s.Id == deviceInfo.PlcId);
- if (modPlc == null)
+ if (checkTaskInfo.Id >= 6)
{
- throw Oops.Bah("鎵句笉鍒癙LC淇℃伅");
+ 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鏈繛鎺ワ紝缁戝畾澶辫触锛�");
+ }
}
- PLCUtil modUtil = new PLCUtil(modPlc);
- var ret= modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
- if (ret.IsSucceed)
+ else
{
- //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
#endregion
}
/// <summary>
- /// 浠诲姟缁撴壒
+ /// 浠诲姟寮哄埗缁撴壒
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[ApiDescriptionSettings(Name = "CloseTaskForPLC")]
- [DisplayName("浠诲姟缁撴壒")]
+ [DisplayName("浠诲姟寮哄埗缁撴壒")]
public async Task CloseTaskForPLC(CloseTaskPLCInput input)
{
- //鍒嗘嫞浠诲姟淇℃伅
+ // 娉ㄩ噴锛氭紨绀烘ā寮忎笉缁戝畾鍒嗛亾銆俵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)
{
@@ -242,49 +286,66 @@
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");
+ //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();
+ // //鏇存柊鍒嗘嫞浠诲姟
+ // await _wcsCheckTaskRep.AsUpdateable(item).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 = "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;
- //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,
+ await _wcsCheckTaskRep.AsUpdateable(modCheckTask).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
- // Type = plc.Type
- // })
- // .FirstAsync();
- ////涓嬪彂鍒嗘嫞浠诲姟
- //HubUtil.PublicCheckTask(order.Adapt<Service.WcsDevice.Dto.WcsDeviceTaskOrderDto>());
- #endregion
- }
}
}
--
Gitblit v1.8.0