From 44908416a5ecd4596118505eea8501681739963f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 25 九月 2024 18:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/Configuration/Database.json | 1
Admin.NET/WCS.Application/Service/WcsOderTask/Dto/WcsOderTaskInput.cs | 8 ++
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 71 ++++++++++++++++-------
Admin.NET/WCS.Application/Entity/WcsCheckTask.cs | 37 ++++++++++++
Admin.NET/WCS.Application/Hub/PlcHub.cs | 44 +++++++++++++-
5 files changed, 135 insertions(+), 26 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index 9ae67f7..669e5a7 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/Admin.NET/WCS.Application/Configuration/Database.json
@@ -13,6 +13,7 @@
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 搴撹繛鎺ュ瓧绗︿覆
"ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+
//"SlaveConnectionConfigs": [ // 璇诲啓鍒嗙/涓讳粠
// {
// "HitRate": 10,
diff --git a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
index 127350a..4d888c8 100644
--- a/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsCheckTask.cs
@@ -79,7 +79,42 @@
/// </summary>
[SugarColumn(ColumnName = "Status", ColumnDescription = "宸ヤ綅缁戝畾鐘舵��", Length = 2)]
public string? Status { get; set; }
-
+
+ /// <summary>
+ /// DB鍖哄煙
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "DbNumber", ColumnDescription = "DB鍖哄煙", Length = 10)]
+ public string DbNumber { get; set; }
+
+ /// <summary>
+ /// 鎶撶鍝佺鍋忕Щ閲�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PlcPos", ColumnDescription = "鎶撶鍝佺鍋忕Щ閲�", Length = 10)]
+ public string PlcPos { get; set; }
+
+ /// <summary>
+ /// 娴佺▼瀛楃被鍨�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PosType", ColumnDescription = "娴佺▼瀛楃被鍨�")]
+ public PLCDataTypeEnum PosType { get; set; }
+
+ /// <summary>
+ /// 鎵规鍋忕Щ閲�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PlcPos", ColumnDescription = "鎵规鍋忕Щ閲�", Length = 10)]
+ public string PosLot { get; set; }
+
+ /// <summary>
+ /// 鎵规娴佺▼瀛楃被鍨�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "PosType", ColumnDescription = "鎵规娴佺▼瀛楃被鍨�")]
+ public PLCDataTypeEnum PosTypeLot { get; set; }
+
/// <summary>
/// 鍝佺鍙�
/// </summary>
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index 0804cad..1075892 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -67,15 +67,53 @@
if (context.BoDemo.HasValue)
{
PLCTaskAction.boDemo = context.BoDemo.Value;
- await _sysConfigService.UpdateConfigValue("sys_demo", context.BoDemo.Value);
+
+ //PLC杩炴帴
+ var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == "10.18.51.120");
+ if (plcStackeConn.Connected)
+ {
+ //鍐欏叆娴佺▼瀛�
+ var ret = plcStackeConn.SetPlcDBValue(PLCDataTypeEnum.Bit, "DB119", "0", PLCTaskAction.boDemo == true ? "1" : "0");
+ if (ret.IsSucceed)
+ {
+ await _sysConfigService.UpdateConfigValue("sys_demo", context.BoDemo.Value);
+ }
+ else
+ {
+ PLCTaskAction.boDemo = !PLCTaskAction.boDemo;
+ }
+ }
+ else
+ {
+ PLCTaskAction.boDemo = !PLCTaskAction.boDemo;
+ }
}
//婊氱瓛鍙嶈浆
if (context.BoDrumReversal.HasValue)
{
PLCTaskAction.boDrumReversal = context.BoDrumReversal.Value;
- await _sysConfigService.UpdateConfigValue("sys_DrumReversal", context.BoDrumReversal.Value);
+
+ //PLC杩炴帴
+ var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == "10.18.51.120");
+ if (plcStackeConn.Connected)
+ {
+ //鍐欏叆娴佺▼瀛�
+ var ret = plcStackeConn.SetPlcDBValue(PLCDataTypeEnum.Bit, "DB119", "0.1", PLCTaskAction.boDemo == true ? "1" : "0");
+ if (ret.IsSucceed)
+ {
+ await _sysConfigService.UpdateConfigValue("sys_DrumReversal", context.BoDrumReversal.Value);
+ }
+ else
+ {
+ PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
+ }
+ }
+ else
+ {
+ PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
+ }
}
- await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline, BoDemo = PLCTaskAction.boDemo});
+ await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline, BoDemo = PLCTaskAction.boDemo, BoDrumReversal = PLCTaskAction.boDrumReversal });
}
}
public class PLCServiceModel
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 2f85b2f..91deb8c 100644
--- a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
@@ -193,38 +193,67 @@
checkTaskInfo.BoxType = taskInfo.BoxType;
checkTaskInfo.Qty = taskInfo.Qty;
checkTaskInfo.Status = "1";//宸茬粦瀹�
- checkTaskInfo.PZNo = skuInfo.PZNo;
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ checkTaskInfo.PZNo = skuInfo.PZNo;
- #region#缁橮LC鍐欐暟鎹�
-
+ #region#缁橮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);
+ var ret= modUtil.SetPlcDBValue(checkTaskInfo.PosType, checkTaskInfo.DbNumber, checkTaskInfo.PlcPos, checkTaskInfo.PZNo);
+ if (ret.IsSucceed)
+ {
+ //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+ await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ }
#endregion
}
[HttpPost]
[ApiDescriptionSettings(Name = "CloseTaskForPLC")]
[DisplayName("浠诲姟缁撴壒")]
- public async Task CloseTaskForPLC(BindTaskPLCInput input)
+ public async Task CloseTaskForPLC(CloseTaskPLCInput input)
{
- #region 璇锋眰PLC鎺ュ彛锛堣繖涓柟娉曞疄闄呮槸棰勭粨鎵癸紝缁橮LC鍙戦�侀缁撴壒淇℃伅锛岀劧鍚嶱LC鍐嶇粰WCS鍙戦�佺粨鎵逛俊鍙峰啀灏嗗垎鎷ｄ俊鎭竻绌猴級
-
- #endregion
//鍒嗘嫞浠诲姟淇℃伅
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.TaskNo = "";
- item.LotNo = "";
- item.SkuNo = "";
- item.SkuName = "";
- item.BoxType = "";
- item.Qty = 0;
- item.PZNo = "";
- item.Status = "0";//鏈粦瀹�
- }
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskList).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ #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);
+ var ret = modUtil.SetPlcDBValue(item.PosType, item.DbNumber, item.PlcPos, item.PZNo);
+ 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();
+ }
+ #endregion
+ }
}
}
diff --git a/Admin.NET/WCS.Application/Service/WcsOderTask/Dto/WcsOderTaskInput.cs b/Admin.NET/WCS.Application/Service/WcsOderTask/Dto/WcsOderTaskInput.cs
index 17e567c..4b8785d 100644
--- a/Admin.NET/WCS.Application/Service/WcsOderTask/Dto/WcsOderTaskInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsOderTask/Dto/WcsOderTaskInput.cs
@@ -207,6 +207,12 @@
public long deviceId { get; set; }
public long oderTaskId { get; set; }
+ }
+ /// <summary>
+ /// 缁撴壒浠诲姟鍙傛暟
+ /// </summary>
+ public class CloseTaskPLCInput
+ {
public string lotNo { get; set; }
-}
\ No newline at end of file
+ }
--
Gitblit v1.8.0