From 9b85a8b67aa6354ee9ea1a13c5799bf1c934922f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 31 十月 2024 18:12:14 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 119 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 154209a..b99dd08 100644
--- a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
@@ -203,26 +203,63 @@
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("浠诲姟缁撴壒")]
+ [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 +279,35 @@
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, "0"); // 瑙ｇ粦鍒嗛亾
+ 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浜や簰澶辫触锛岀粨鎵瑰け璐ワ紒");
+ }
}
-
- //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
- }
+ else
+ {
+ throw Oops.Bah("PCL鏈繛鎺ワ紝缁撴壒澶辫触锛�");
+ }
+ #endregion
+ }
}
}
--
Gitblit v1.8.0