From b7fdd14f4fa28abfdce506fe2ad8f9b4446151c8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 25 九月 2024 15:34:51 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs | 82 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
index 7963543..91deb8c 100644
--- a/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs
@@ -20,11 +20,14 @@
private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
private readonly SqlSugarRepository<WcsDevice> _wcsDeviceRep;
private readonly SqlSugarRepository<WcsOderTask> _wcsOderTaskRep;
- public WcsCheckTaskService(SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsDevice> wcsDeviceRep, SqlSugarRepository<WcsOderTask> wcsOderTaskRep)
+ private readonly SqlSugarRepository<WcsMateialPzInfo> _wcsMateialPzInfoRep;
+
+ public WcsCheckTaskService(SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsDevice> wcsDeviceRep, SqlSugarRepository<WcsOderTask> wcsOderTaskRep, SqlSugarRepository<WcsMateialPzInfo> wcsMateialPzInfoRep)
{
_wcsCheckTaskRep = wcsCheckTaskRep;
_wcsDeviceRep = wcsDeviceRep;
_wcsOderTaskRep = wcsOderTaskRep;
+ _wcsMateialPzInfoRep = wcsMateialPzInfoRep;
}
/// <summary>
@@ -42,7 +45,7 @@
.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)
@@ -54,7 +57,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()))
@@ -167,6 +170,12 @@
{
throw Oops.Oh("浠诲姟鐘舵�佸紓甯�");
}
+ //鐗╂枡鍝佺淇℃伅
+ var skuInfo = await _wcsMateialPzInfoRep.Context.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == taskInfo.SkuNo).FirstAsync();
+ if (skuInfo == null)
+ {
+ throw Oops.Oh("鐗╂枡鍝佺淇℃伅涓嶅瓨鍦�");
+ }
//鍒嗘嫞浠诲姟淇℃伅
var checkTaskInfo = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Port == deviceInfo.StationNum).FirstAsync();
if (checkTaskInfo == null)
@@ -184,30 +193,67 @@
checkTaskInfo.BoxType = taskInfo.BoxType;
checkTaskInfo.Qty = taskInfo.Qty;
checkTaskInfo.Status = "1";//宸茬粦瀹�
- //鏇存柊鍒嗘嫞浠诲姟
- await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+ checkTaskInfo.PZNo = skuInfo.PZNo;
+
+ #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鎺ュ彛
- #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.LotNo = "";
- item.SkuNo = "";
- item.SkuName = "";
- item.BoxType = "";
- item.Qty = 0;
- 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
+ }
}
}
--
Gitblit v1.8.0