From b0c756bd9b37bc2eeffbb0f39c8000648061d82c Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期六, 08 三月 2025 17:43:00 +0800
Subject: [PATCH] 出库条件判断
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 310 insertions(+), 26 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 413c29f..17d369e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,8 +16,12 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using WIDESEAWCS_Common.LocationEnum;
+using WIDESEAWCS_Common.StockEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -27,6 +31,7 @@
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_IWMSPart;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_Model.Models.System;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
@@ -40,7 +45,10 @@
private readonly IRepository<Dt_StockInfo> _stockRepository;
private readonly IRepository<Dt_LocationInfo> _locationRepository;
private readonly IRepository<dt_batchInfo> _batchinfoRepository;
-
+ private readonly IRepository<Dt_Task_hty> _taskhtyRepository;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
+ private readonly Idt_ErrormsginfoService _ErrormsginfoService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -60,12 +68,18 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
+ //SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService,
ITaskExecuteDetailService taskExecuteDetailService,
IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository,
IRepository<Dt_StockInfo> stockRepository,
IRepository<Dt_LocationInfo> locationRepository,
IRepository<dt_batchInfo> batchRepository,
+ IRepository<Dt_Task_hty> taskhtyRepository,
+ IRepository<dt_errormsgInfo> errorinfoRepository,
+ Idt_ErrormsginfoService errormsginfoService,
+ IUnitOfWorkManage unitOfWorkManage,
IMapper mapper) : base(BaseDal)
{
_routerService = routerService;
@@ -74,6 +88,10 @@
_stockRepository = stockRepository;
_locationRepository = locationRepository;
_batchinfoRepository = batchRepository;
+ _taskhtyRepository = taskhtyRepository;
+ _unitOfWorkManage = unitOfWorkManage;
+ _errorinfoRepository = errorinfoRepository;
+ _ErrormsginfoService = errormsginfoService;
_mapper = mapper;
}
@@ -167,6 +185,17 @@
}
/// <summary>
+ /// 鏍规嵁浠诲姟鐘舵�佹煡璇换鍔�
+ /// </summary>
+ /// <param name="deviceNo">璁惧缂栧彿</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryTaskState()
+ {
+ return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
+ }
+
+ /// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
@@ -222,12 +251,74 @@
/// <param name="deviceNo">璁惧缂栧彿</param>
/// <param name="currentAddress">褰撳墠鍦板潃</param>
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
- public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
+ public Dt_Task QueryStackerCraneTask(string workTpe, string currentAddress = "")
{
- if (string.IsNullOrEmpty(currentAddress))
- return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
+ Dt_Task task = new Dt_Task();
+ try
+ {
+ //浼樺厛鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁鏈夊彇璐у畬鎴愮殑浠诲姟
+ task = BaseDal.QueryFirst(v => v.TaskState == (int)TaskInStatusEnum.Line_Ingrab || v.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting);
+ if (task != null)
+ {
+ //浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
+ return task;
+ }
+ else
+ {
+ //鏌ヨ澶╄溅绉诲姩浠诲姟
+ task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
+ if (task!=null)
+ {
+ return task;
+ }
+ }
+ //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鐘舵�佷负闈炴柊寤虹殑
+ //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
+ //if (task != null)
+ //{
+ // throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ //}
+ //if (task != null)
+ //{
+ // if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
+ // {
+
+ // }
+ //}
+ if (workTpe.Equals("In"))
+ {
+ task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
+ }
+ else if (workTpe.Equals("Out"))
+ {
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ }
+
+ }
+ catch (Exception)
+ {
+ //灏嗛敊璇俊鎭洿鏂拌嚦閿欒淇℃伅璁板綍琛�
+
+ }
+ return task;
+ }
+
+ public Dt_Task QueryTasking()
+ {
+ Dt_Task task = new Dt_Task();
+ task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew
+ && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
+ && v.TaskState != (int)TaskOutStatusEnum.OutNew
+ && v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
+ && v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
+ if (task!=null)
+ {
+ return task;
+ }
else
- return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
+ {
+ return null;
+ }
}
/// <summary>
@@ -266,7 +357,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryTakNnmTask(int taskNum)
{
- return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
+ return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
}
/// <summary>
/// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
@@ -284,6 +375,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -304,6 +396,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -329,21 +422,21 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- task.TaskState = (int)TaskOutStatusEnum.OutPending;
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- task.TaskState = (int)TaskInStatusEnum.InPending;
- }
+ //if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ //{
+ // task.TaskState = (int)TaskOutStatusEnum.OutPending;
+ //}
+ //else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ //{
+ // task.TaskState = (int)TaskInStatusEnum.InPending;
+ //}
task.ExceptionMessage = message;
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
+ //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
content = WebResponseContent.Instance.OK();
}
@@ -355,17 +448,42 @@
}
/// <summary>
- /// 鏇存柊浠诲姟鐘舵�佷俊鎭紝骞跺悓姝ヨ嚦WMS
+ /// 鏇存柊浠诲姟鐘舵�佷俊鎭�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="status">浠诲姟鐘舵��</param>
public void UpdateTaskStatus(int taskNum, int status)
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null) return;
- task.TaskState = status;
- task.ModifyDate = DateTime.Now;
- BaseDal.UpdateData(task);
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
+ if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ {
+ task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
+ }
+ else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
+ {
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
+ }
+ else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ {
+ task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
+ }
+ else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
+ {
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
+ }
+ else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
+ }
+ task.ModifyDate = DateTime.Now;
+ BaseDal.UpdateData(task);
+ }
+ catch (Exception ex)
+ {
+ UpdateTaskExceptionMessage(taskNum, ex.Message);
+ }
}
/// <summary>
@@ -493,30 +611,196 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent StackCraneTaskCompleted(int taskNum)
+ public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight)
{
WebResponseContent content = new WebResponseContent();
try
{
- var nawtask = BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
+ var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
if (nawtask == null)
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
}
+
+
if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
-
+ var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
//鏂板缓搴撳瓨
+ Dt_StockInfo stock = new Dt_StockInfo();
+ stock.LocationCode = nawtask.TargetAddress;
+ stock.Weight = (decimal)weight;
+ stock.StockStatus = (int)stockEnum.Free;
+ stock.BatchNo = batck.InBatch;
+ if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
+ {
+ stock.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stock.Remark = (int)MateTypeEnum.WaiGou;
+ }
+ Dt_StockInfo stockTow = new Dt_StockInfo();
+ stockTow.LocationCode = nawtask.NextAddress;
+ stockTow.Weight = (decimal)weight;
+ stockTow.StockStatus = (int)stockEnum.Free;
+ stockTow.BatchNo = batck.InBatch;
+ if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+ {
+ stockTow.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stockTow.Remark = (int)MateTypeEnum.WaiGou;
+ }
+ //淇敼璐т綅淇℃伅
+ var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
+ location.LocationStatus = (int)LocationStatusEnum.InStock;
+ //淇敼璐т綅淇℃伅
+ var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.AddData(stock);
+ _stockRepository.AddData(stockTow);
+ _locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationtow);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
}
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
-
+ //鏌ユ壘搴撳瓨
+ var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
+ if (stock == null)
+ {
+ throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
+ }
+ var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ //淇敼璐т綅鐘舵��
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+ location.LocationStatus = (int)LocationStatusEnum.Free;
+ //淇敼璐т綅鐘舵��
+ var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationTow.LocationStatus = (int)LocationStatusEnum.Free;
+ //鍑嗗鍘嗗彶浠诲姟鏁版嵁
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ //濡傛灉鏀捐揣浣嶇疆琛屾槸40锛屽垯绔嬮┈鐢熸垚涓�鏉＄Щ鍔ㄤ换鍔�
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task Movstask = new Dt_Task();
+ Movstask.Roadway = "TC01";
+ Movstask.TaskType = (int)TaskMoveEnum.Mowe;
+ Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ Movstask.SourceAddress = "0";
+ Movstask.TargetAddress = "1-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
+ //寮�濮嬫暟鎹簱浜嬪姟
+
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(Movstask);
+ _stockRepository.DeleteData(stock);
+ _stockRepository.DeleteData(Towstock);
+ _locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationTow);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ {
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task Movstask = new Dt_Task();
+ Movstask.Roadway = "TC01";
+ Movstask.TaskType = (int)TaskMoveEnum.Mowe;
+ Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ Movstask.SourceAddress = "0";
+ Movstask.TargetAddress = "1-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(Movstask);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
}
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ //鍥炴粴浜嬪姟
+ _unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�");
+ UpdateTaskExceptionMessage(taskNum,ex.Message);
}
return content;
}
--
Gitblit v1.9.3