From 2b8a51779ff7107c9423e21935c169d6bb877d64 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 11 九月 2024 14:47:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

---
 Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs |   73 +++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 62d8fe6..3f2e706 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,7 +1,9 @@
 锘�
 using AngleSharp.Dom;
+using Elastic.Clients.Elasticsearch.Tasks;
 using Furion.DatabaseAccessor;
 using Microsoft.AspNetCore.SignalR;
+using WCS.Application.Entity;
 
 namespace WCS.Application;
 
@@ -13,11 +15,15 @@
 {
     private readonly SqlSugarRepository<WcsTask> _wcsTaskRep;
     private readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;
+    private readonly SqlSugarRepository<WcsCheckTask> _wcsCheckTaskRep;
+    private readonly SqlSugarRepository<WcsMateialPzInfo> _wcsMateialPzInfoRep;
 
-    public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext)
+    public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext, SqlSugarRepository<WcsCheckTask> wcsCheckTaskRep, SqlSugarRepository<WcsMateialPzInfo> wcsMateialPzInfoRep)
     {
         _wcsTaskRep = wcsTaskRep;
         _taskLogHubContext = taskLogHubContext;
+        _wcsCheckTaskRep = wcsCheckTaskRep;
+        _wcsMateialPzInfoRep = wcsMateialPzInfoRep;
     }
 
     /// <summary>
@@ -52,8 +58,52 @@
     [DisplayName("澧炲姞浠诲姟琛�")]
     public async Task<long> Add(AddWcsTaskInput input)
     {
+        if(await _wcsTaskRep.AsQueryable().AnyAsync(s => s.TaskNo == input.TaskNo))
+        {
+            throw Oops.Bah("浠诲姟鍙烽噸澶�");
+        }
+        if (input.UnstackingMode == UnstackingModeEnum.Machine)
+        {
+            if (string.IsNullOrEmpty(input.SkuNo) || string.IsNullOrEmpty(input.SkuName))
+            {
+                throw Oops.Bah("鏈哄櫒浜烘嫞璐э紝鐗╂枡鍜屾壒娆′俊鎭笉鑳戒负绌�");
+            }
+        }
         var entity = input.Adapt<WcsTask>();
+        entity.Origin = "WCS";
         await _wcsTaskRep.InsertAsync(entity);
+
+        #region 缁戝畾鍨涙満
+
+        //鐗╂枡鍝佺淇℃伅
+        var skuInfo = await _wcsMateialPzInfoRep.Context.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == input.SkuNo).FirstAsync();
+        if (skuInfo == null)
+        {
+            throw Oops.Oh("鐗╂枡鍝佺淇℃伅涓嶅瓨鍦�");
+        }
+        //鍒嗘嫞浠诲姟淇℃伅
+        var checkTaskInfo = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "0" && w.RoboatType == "0").OrderBy(o => o.LineNo).FirstAsync();
+        if (checkTaskInfo == null)
+        {
+            throw Oops.Oh("鍒嗘嫞浠诲姟淇℃伅涓嶅瓨鍦�");
+        }
+        if (checkTaskInfo.Status != "0")
+        {
+            throw Oops.Oh("璇ュ伐浣嶅凡缁戝畾浠诲姟锛岃鍕垮啀娆＄粦瀹�");
+        }
+        checkTaskInfo.OrderNo = "";
+        checkTaskInfo.TaskNo = entity.TaskNo;
+        checkTaskInfo.LotNo = entity.LotNo;
+        checkTaskInfo.SkuNo = entity.SkuNo;
+        checkTaskInfo.SkuName = entity.SkuName;
+        checkTaskInfo.BoxType = "";
+        checkTaskInfo.Qty = entity.Qty;
+        checkTaskInfo.Status = "1";//宸茬粦瀹�
+        checkTaskInfo.PZNo = skuInfo.PZNo;
+        //鏇存柊鍒嗘嫞浠诲姟
+        await _wcsCheckTaskRep.AsUpdateable(checkTaskInfo).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+        #endregion
+
         return entity.Id;
     }
 
@@ -134,7 +184,7 @@
                 modTask.IsSuccess = TaskSuccessEnum.Fail;
             modTask.FinishDate = DateTime.Now;
             modTask.Status = input.Status;
-            await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate }).ExecuteCommandAsync();
+            await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate, s.UpdateTime,s.UpdateUserId,s.UpdateUserName }).ExecuteCommandAsync();
             //鍐欏叆浠诲姟鏄庣粏琛�
             WcsTaskMonitor modTaskMonitor = new WcsTaskMonitor()
             {
@@ -150,6 +200,25 @@
             await _wcsTaskRep.Context.Insertable(modTaskMonitor).ExecuteCommandAsync();
             //await _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
             //await _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+            #region
+            //鍒嗘嫞浠诲姟淇℃伅
+            var checkTaskList = _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.TaskNo == modTask.TaskNo && w.Status == "1").ToList();
+            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();
+            #endregion
         }
         else
         {

--
Gitblit v1.8.0