From ac2920c6c36227646c03a38c76a335120b449817 Mon Sep 17 00:00:00 2001 From: Zhang-Hong-Lin <a3219986988@163.com> Date: 星期日, 06 七月 2025 18:29:13 +0800 Subject: [PATCH] 优先级 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 957 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 865 insertions(+), 92 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 dd4b366..217ceea 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" @@ -50,6 +50,12 @@ private readonly IRepository<dt_errormsgInfo> _errorinfoRepository; private readonly Idt_ErrormsginfoService _ErrormsginfoService; private readonly IMapper _mapper; + private readonly IRepository<dt_stationInfo> _dt_stationInfoRepository; + private readonly IRepository<Dt_Task> _dt_taskRepositiry; + private readonly IRepository<Dt_LocationInfo> _LocationInfoRepository; + private readonly IRepository<Dt_StockInfo> _StockInfoRepository; + private readonly IRepository<dt_batchInfo> _batchInfoRepository; + private readonly IRepository<dt_outstockinfo> _outStockRepository; private Dictionary<string, OrderByType> _taskOrderBy = new() { @@ -70,16 +76,22 @@ //SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, - ITaskExecuteDetailService taskExecuteDetailService, + 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, + IRepository<dt_stationInfo> dt_stationInfoRepository, + IRepository<Dt_Task> dt_taskRepositiry, Idt_ErrormsginfoService errormsginfoService, IUnitOfWorkManage unitOfWorkManage, + IRepository<Dt_StockInfo> StockInfoRepository, + IRepository<dt_batchInfo> batchInfoRepository, + IRepository<Dt_LocationInfo> LocationInfoRepository, + IRepository<dt_outstockinfo> outStockRepository, IMapper mapper) : base(BaseDal) { _routerService = routerService; @@ -93,6 +105,12 @@ _errorinfoRepository = errorinfoRepository; _ErrormsginfoService = errormsginfoService; _mapper = mapper; + _dt_stationInfoRepository = dt_stationInfoRepository; + _dt_taskRepositiry = dt_taskRepositiry; + _StockInfoRepository = StockInfoRepository; + _LocationInfoRepository = LocationInfoRepository; + _batchInfoRepository = batchInfoRepository; + _outStockRepository = outStockRepository; } /// <summary> @@ -185,6 +203,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> @@ -252,20 +281,38 @@ //浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц 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(); + //OrderBy(鍗囧簭鎺掑簭) + task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).First(); } else if (workTpe.Equals("Out")) { - task = BaseDal.QueryData(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First(); + task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderByDescending(v => v.Grade).First(); } + } catch (Exception) { @@ -273,6 +320,24 @@ } 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 null; + } } /// <summary> @@ -311,13 +376,13 @@ /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns> public Dt_Task QueryTakNnmTask(int taskNum) { - return BaseDal.QueryFirst(v=>v.TaskId== taskNum); + return BaseDal.QueryFirst(v => v.TaskId == taskNum); } /// <summary> /// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴� /// </summary> /// <returns></returns> - public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) + public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) { WebResponseContent content = new WebResponseContent(); try @@ -329,7 +394,7 @@ catch (Exception ex) { content = WebResponseContent.Instance.Error(ex.Message); - UpdateTaskExceptionMessage(task.TaskNum, ex.Message); + UpdateTaskExceptionMessage(task.TaskId, ex.Message); } return content; } @@ -350,7 +415,7 @@ catch (Exception ex) { content = WebResponseContent.Instance.Error(ex.Message); - UpdateTaskExceptionMessage(task.TaskNum, ex.Message); + UpdateTaskExceptionMessage(task.TaskId, ex.Message); } return content; } @@ -376,7 +441,7 @@ 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) //{ @@ -410,22 +475,26 @@ { try { - Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum); - if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound) + Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum); + if (status == 2 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)) { task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting; } - else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound) + else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)) { task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting; } - if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound) + else if (status == 3 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)) { task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting; } - else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound) + else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)) { 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); @@ -561,58 +630,245 @@ /// </summary> /// <param name="taskNum">浠诲姟缂栧彿</param> /// <returns>杩斿洖澶勭悊缁撴灉</returns> - public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight) + public WebResponseContent StackCraneTaskCompleted(int taskNum, float weight) { WebResponseContent content = new WebResponseContent(); try { - var nawtask = BaseDal.QueryFirst(v=>v.TaskId== 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) + + if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu) { - 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) + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�"); + string sourceAddress = station.Row + "-" + station.Column + "-1"; + if (nawtask.SourceAddress.Equals(sourceAddress)) { - stock.Remark = (int)MateTypeEnum.ZiChan; + 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; + stock.Remark = 3; + //淇敼璐т綅淇℃伅 + var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress); + location.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); + _locationRepository.UpdateData(location); + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); } else { - stock.Remark = (int)MateTypeEnum.WaiGou; + 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(); } - 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) + } + else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu) + { + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙"); + string targetAddress = station.Row + "-" + station.Column + "-1"; + if (nawtask.TargetAddress.Equals(targetAddress)) { - stockTow.Remark = (int)MateTypeEnum.ZiChan; + //鏌ユ壘搴撳瓨 + var stock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress); + if (stock == null) + { + throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�"); + } + //淇敼璐т綅鐘舵�� + var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress); + location.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 = "8-5-1"; + Movstask.NextAddress = "text"; + Movstask.Grade = 1; + Movstask.WMSId = 3; + Movstask.Remark = 0; + Movstask.PalletCode = "text"; + Movstask.CurrentAddress = "text"; + + //寮�濮嬫暟鎹簱浜嬪姟 + BaseDal.AddData(Movstask); + _unitOfWorkManage.BeginTran(); + _stockRepository.DeleteData(stock); + _locationRepository.UpdateData(location); + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); } else { - stockTow.Remark = (int)MateTypeEnum.WaiGou; + //鏌ユ壘搴撳瓨 + 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 = "8-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(); } - //淇敼璐т綅淇℃伅 - 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; + } + else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu) + { //澶勭悊浠诲姟淇℃伅 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.TaskState = (int)TaskOutStatusEnum.OutFinish; taskhty.SourceAddress = nawtask.SourceAddress; taskhty.TargetAddress = nawtask.TargetAddress; taskhty.ExceptionMessage = nawtask.ExceptionMessage; @@ -622,57 +878,38 @@ 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) + if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu) { - throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�"); + //寮�濮嬪垱寤轰换鍔� + Dt_Task Movstask = new Dt_Task(); + Movstask.Roadway = "TC01"; + Movstask.TaskType = (int)TaskMoveEnum.Mowe; + Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove; + Movstask.SourceAddress = "0"; + Movstask.TargetAddress = "8-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(); } - 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)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.DeleteData(stock); - _stockRepository.DeleteData(Towstock); - _locationRepository.UpdateData(location); - _locationRepository.UpdateData(locationTow); - //_taskhtyRepository.AddData(taskhty); - BaseDal.DeleteData(nawtask); - //鎻愪氦浜嬪姟 - _unitOfWorkManage.CommitTran(); + else + { + //寮�濮嬫暟鎹簱浜嬪姟 + _unitOfWorkManage.BeginTran(); + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); + } } content = WebResponseContent.Instance.OK(); } @@ -681,7 +918,7 @@ //鍥炴粴浜嬪姟 _unitOfWorkManage.RollbackTran(); content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�"); - UpdateTaskExceptionMessage(taskNum,ex.Message); + UpdateTaskExceptionMessage(taskNum, ex.Message); } return content; } @@ -776,5 +1013,541 @@ } return content; } + + public WebResponseContent AtOnceUpdate(int taskid) + { + WebResponseContent content = new WebResponseContent(); + Dt_Task nawtask = BaseDal.QueryFirst(v => v.TaskId == taskid); + //鍏ュ簱 + if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu) + { + //鍓旈櫎鍏ュ簱 + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�"); + string sourceAddress = station.Row + "-" + station.Column + "-1"; + if (nawtask.SourceAddress.Equals(sourceAddress)) + { + var batck = _batchinfoRepository.QueryFirst(v => v.Id == 1); + //鏂板缓搴撳瓨 + Dt_StockInfo stock = new Dt_StockInfo(); + stock.LocationCode = nawtask.TargetAddress; + stock.StockStatus = (int)stockEnum.Free; + stock.BatchNo = batck.InBatch; + stock.Remark = (int)MateTypeEnum.TiChu; + //淇敼璐т綅淇℃伅 + var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress); + location.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); + _locationRepository.UpdateData(location); + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); + } + //姝e父鍏ュ簱 + else + { + var batck = _batchinfoRepository.QueryFirst(v => v.Id == 1); + //鏂板缓搴撳瓨 + Dt_StockInfo stock = new Dt_StockInfo(); + stock.LocationCode = nawtask.TargetAddress; + 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.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 || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu) + { + //鍓旈櫎鍑哄簱 + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙"); + string targetAddress = station.Row + "-" + station.Column + "-1"; + if (nawtask.TargetAddress.Equals(targetAddress)) + { + //鏌ユ壘搴撳瓨 + var stock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress); + if (stock == null) + { + throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�"); + } + //淇敼璐т綅鐘舵�� + var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress); + location.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; + //寮�濮嬫暟鎹簱浜嬪姟 + + _unitOfWorkManage.BeginTran(); + _stockRepository.DeleteData(stock); + _locationRepository.UpdateData(location); + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); + } + //姝e父鍑哄簱 + else + { + //鏌ユ壘搴撳瓨 + 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); + if (locationTow!=null) + { + 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; + //寮�濮嬫暟鎹簱浜嬪姟 + + _unitOfWorkManage.BeginTran(); + _stockRepository.DeleteData(stock); + _locationRepository.UpdateData(location); + if (locationTow != null) + { + _locationRepository.UpdateData(locationTow); + _stockRepository.DeleteData(Towstock); + } + _taskhtyRepository.AddData(taskhty); + BaseDal.DeleteData(nawtask); + //鎻愪氦浜嬪姟 + _unitOfWorkManage.CommitTran(); + } + } + return content.OK("瀹屾垚"); + } + + public WebResponseContent speciadelete(Dt_Task task) + { + WebResponseContent content = new WebResponseContent(); + if (task.TaskState == (int)TaskMoveStatusEnum.OutNewMove) + { + BaseDal.DeleteData(task); + } + else if (task.TaskState == (int)TaskInStatusEnum.InNew) + { + //鍓旈櫎鍏ュ簱 + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�"); + string sourceAddress = station.Row + "-" + station.Column + "-1"; + if (task.SourceAddress.Equals(sourceAddress)) + { + Dt_LocationInfo locationinfo = _locationRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); + locationinfo.LocationStatus = 0; + _unitOfWorkManage.BeginTran(); + _locationRepository.UpdateData(locationinfo); + BaseDal.DeleteData(task); + _unitOfWorkManage.CommitTran(); + return content.OK("2"); + } + else + { + //淇敼璐т綅淇℃伅 + var location = _locationRepository.QueryFirst(v => v.LocationCode == task.TargetAddress); + location.LocationStatus = (int)LocationStatusEnum.Free; + //淇敼璐т綅淇℃伅 + var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == task.NextAddress); + locationtow.LocationStatus = (int)LocationStatusEnum.Free; + _unitOfWorkManage.BeginTran(); + _locationRepository.UpdateData(location); + _locationRepository.UpdateData(locationtow); + BaseDal.DeleteData(task); + _unitOfWorkManage.CommitTran(); + return content.OK("3"); + } + } + else if (task.TaskState == (int)TaskOutStatusEnum.OutNew) + { + //鍓旈櫎鍑哄簱 + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙"); + string targetAddress = station.Row + "-" + station.Column + "-1"; + if (task.TargetAddress.Equals(targetAddress)) + { + //淇敼璐т綅淇℃伅 + var location = _locationRepository.QueryFirst(v => v.LocationCode == task.SourceAddress); + location.LocationStatus = (int)LocationStatusEnum.InStock; + Dt_StockInfo stockInfo = _stockRepository.QueryFirst(v => v.LocationCode == task.SourceAddress); + stockInfo.StockStatus = (int)stockEnum.Free; + _unitOfWorkManage.BeginTran(); + _locationRepository.UpdateData(location); + _stockRepository.UpdateData(stockInfo); + BaseDal.DeleteData(task); + _unitOfWorkManage.CommitTran(); + return content.OK("4"); + } + else + { + //淇敼璐т綅淇℃伅 + var location = _locationRepository.QueryFirst(v => v.LocationCode == task.SourceAddress); + location.LocationStatus = (int)LocationStatusEnum.InStock; + //淇敼璐т綅淇℃伅 + var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == task.NextAddress); + Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress); + + if (locationtow != null) + { + locationtow.LocationStatus = (int)LocationStatusEnum.InStock; + stockInfos.StockStatus = (int)stockEnum.Free; + } + Dt_StockInfo stockInfo = _stockRepository.QueryFirst(v => v.LocationCode == task.SourceAddress); + stockInfo.StockStatus = (int)stockEnum.Free; + + _unitOfWorkManage.BeginTran(); + _locationRepository.UpdateData(location); + if (locationtow != null) + { + _locationRepository.UpdateData(locationtow); + _stockRepository.UpdateData(stockInfos); + } + _stockRepository.UpdateData(stockInfo); + BaseDal.DeleteData(task); + _unitOfWorkManage.CommitTran(); + return content.OK("5"); + } + } + return content.OK("1"); + } + + public WebResponseContent speciaupdate(Dt_Task task) + { + WebResponseContent content = new WebResponseContent(); + if (task.TaskState == (int)TaskInStatusEnum.InNew) + { + task.TaskState = (int)TaskInStatusEnum.Line_Ingrab; + BaseDal.UpdateData(task); + } + else if (task.TaskState == (int)TaskInStatusEnum.Line_Ingrab) + { + task.TaskState = (int)TaskInStatusEnum.InNew; + BaseDal.UpdateData(task); + } + else if (task.TaskState == (int)TaskOutStatusEnum.OutNew) + { + task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting; + BaseDal.UpdateData(task); + } + else if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting) + { + task.TaskState = (int)TaskOutStatusEnum.OutNew; + BaseDal.UpdateData(task); + } + else + { + return content.OK("鐘舵�佷笉鍏佽"); + } + return content.OK("1"); + } + + public WebResponseContent banzidong(string wei, string weis) + { + WebResponseContent content = new WebResponseContent(); + //if (!OHTJob.oHTReadData.R_ZXJ_isWork) + //{ + // throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false"); + //} + var isout = _outStockRepository.QueryFirst(v => v.Id == 1); + if (isout.isout == 0) + { + //if (!OHTJob.oHTReadData.R_ZXJ_TCMode) + //{ + // throw new Exception($"鏁村舰鏈轰笉灞炰簬澶╄溅涓婃枡妯″紡鎴栧ぉ杞︽斁鏉夸俊鍙蜂负false"); + //} + //if (!OHTJob.oHTReadData.R_HC_isReadyWork) + //{ + // throw new Exception($"鏁村舰鏈哄ぉ杞︽斁鏉夸俊鍙蜂负false"); + //} + //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉� + var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); + if (oldtask != null) + { + throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�"); + } + + //鏌ヨ搴撳瓨 + Dt_StockInfo ku = _stockRepository.QueryFirst(v => v.LocationCode == wei); + if (ku == null) + { + return content.OK("3"); + } + //鏌ヨ鐩搁偦搴撳瓨 + Dt_StockInfo kus = _stockRepository.QueryFirst(v => v.LocationCode == weis); + ku.StockStatus = (int)stockEnum.Lock; + kus.StockStatus = (int)stockEnum.Lock; + //鏌ヨ璐т綅 + Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei); + //鏌ヨ鐩搁偦璐т綅 + Dt_LocationInfo huos = _LocationInfoRepository.QueryFirst(v => v.LocationCode == weis); + huo.LocationStatus = (int)LocationStatusEnum.Lock; + huos.LocationStatus = (int)LocationStatusEnum.Lock; + //鏌ヨ缁堢偣绔欏彴淇℃伅 + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鏁村舰鏈烘斁鏂欎綅"); + //寮�濮嬪垱寤轰换鍔� + Dt_Task outtask = new Dt_Task(); + outtask.Roadway = "TC01"; + outtask.TaskType = (int)TaskOutboundTypeEnum.Outbound; + outtask.TaskState = (int)TaskOutStatusEnum.OutNew; + outtask.SourceAddress = ku.LocationCode; + outtask.TargetAddress = station.Row + "-" + station.Column + "-1"; + outtask.NextAddress = huos.LocationCode; + outtask.Grade = 2; + outtask.WMSId = 3; + outtask.Remark = kus.Remark; + outtask.PalletCode = "text"; + outtask.CurrentAddress = "text"; + _unitOfWorkManage.BeginTran(); + _LocationInfoRepository.UpdateData(huo); + _LocationInfoRepository.UpdateData(huos); + _StockInfoRepository.UpdateData(ku); + _dt_taskRepositiry.AddData(outtask); + _StockInfoRepository.UpdateData(kus); + _unitOfWorkManage.CommitTran(); + return content.OK("2"); + } + return content.OK("1"); + } + + public WebResponseContent zhijiechuku() + { + Dt_Task task = new Dt_Task(); + WebResponseContent content = new WebResponseContent(); + var isout = _outStockRepository.QueryFirst(v => v.Id == 1); + if (isout.isout == 0) + { + var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); + if (oldtask != null) + { + throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�"); + } + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙"); + task.TargetAddress = station.Row + "-" + station.Column + "-1"; + var stations = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�"); + task.SourceAddress = stations.Row + "-" + stations.Column + "-1"; + var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress); + if (oldhtytask == null) + { + task.Grade = 3; + task.Remark = (int)MateTypeEnum.TiChu; + task.NextAddress = "text"; + task.Roadway = "TC01"; + task.TaskType = (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu; + task.TaskState = (int)TaskOutStatusEnum.OutNew; + task.PalletCode = "text"; + task.CurrentAddress = "text"; + task.WMSId = 2; + _dt_taskRepositiry.AddData(task); + return content.OK("2"); + } + } + else + { + return content.OK("1"); + } + return content.OK("3"); + } + + public WebResponseContent tichuchuku(string wei) + { + Dt_Task task = new Dt_Task(); + WebResponseContent content = new WebResponseContent(); + //if (!OHTJob.oHTReadData.R_TCMode && !OHTJob.oHTReadData.R_TC_isready) + //{ + // throw new Exception($"瑙勬暣鏈哄墧闄ゆ灦瀛愬彲鏀炬澘鎴栧墧闄や笂鏂欐ā寮忎俊鍙蜂负false"); + //} + //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉� + var isout = _outStockRepository.QueryFirst(v => v.Id == 1); + if (isout.isout == 0) + { + var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); + if (oldtask != null) + { + throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�"); + } + //鏌ヨ搴撳瓨 + Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei); + if (huo.LocationStatus == 0) + { + return content.OK("4"); + } + huo.LocationStatus = 1; + Dt_StockInfo stockinfo = _StockInfoRepository.QueryFirst(v => v.LocationCode == wei); + if (stockinfo==null) + { + return content.OK("4"); + } + stockinfo.StockStatus = 1; + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙"); + task.TargetAddress = station.Row + "-" + station.Column + "-1"; + var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress); + if (oldhtytask == null) + { + task.SourceAddress = wei; + task.Grade = 3; + task.Remark = (int)MateTypeEnum.TiChu; + task.NextAddress = "text"; + task.Roadway = "TC01"; + task.TaskType = (int)TaskOutboundTypeEnum.TiChuChuKu; + task.TaskState = (int)TaskOutStatusEnum.OutNew; + task.PalletCode = "text"; + task.CurrentAddress = "text"; + task.WMSId = 2; + _unitOfWorkManage.BeginTran(); + _dt_taskRepositiry.AddData(task); + _LocationInfoRepository.UpdateData(huo); + _StockInfoRepository.UpdateData(stockinfo); + _unitOfWorkManage.CommitTran(); + return content.OK("2"); + } + } + return content.OK("3"); + } + + public WebResponseContent tichuruku(string wei) + { + Dt_Task task = new Dt_Task(); + WebResponseContent content = new WebResponseContent(); + //if (!OHTJob.oHTReadData.R_ZXJ_isWork) + //{ + // throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false"); + //} + var isout = _outStockRepository.QueryFirst(v => v.Id == 1); + if (isout.isout == 0) + { + //鍒ゆ柇搴撳瓨鏄惁鏈夎揣 + //鏌ヨ璐т綅 + Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei); + if (huo.LocationStatus!=0) + { + return content.OK("4"); + } + huo.LocationStatus = 1; + var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�"); + task.SourceAddress = station.Row + "-" + station.Column + "-1"; + var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress); + if (oldhtytask == null) + { + task.TargetAddress = wei; + task.Grade = 3; + task.Remark = (int)MateTypeEnum.TiChu; + task.NextAddress = "text"; + task.Roadway = "TC01"; + task.TaskType = (int)TaskInboundTypeEnum.TiChuRuKu; + task.TaskState = (int)TaskInStatusEnum.InNew; + task.PalletCode = "text"; + task.CurrentAddress = "text"; + task.WMSId = 2; + _unitOfWorkManage.BeginTran(); + _dt_taskRepositiry.AddData(task); + _LocationInfoRepository.UpdateData(huo); + _unitOfWorkManage.CommitTran(); + return content.OK("2"); + } + } + else + { + return content.OK("1"); + } + return content.OK("3"); + } } } -- Gitblit v1.9.3