From ce40df5daffae0d17b4e9fa7cb6d677afaa4d66f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 十月 2025 11:20:30 +0800
Subject: [PATCH] 更新最新程序，ERP代码，MES代码等
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs | 329 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 204 insertions(+), 125 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
index 6bbdb17..309e5c9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
@@ -1,15 +1,19 @@
-锘縰sing System;
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OtherEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Task;
using WIDESEA_Model.Models;
@@ -23,140 +27,109 @@
/// <param name="taskNum"></param>
/// <param name="locationCode"></param>
/// <returns></returns>
- public WebResponseContent IsRelocation(int taskNum, string locationCode)
- {
- try
- {
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璐т綅淇℃伅");
- }
+ //public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ //{
+ // try
+ // {
+ // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
+ // if (locationInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璐т綅淇℃伅");
+ // }
- Dt_Task task = Repository.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
- }
+ // Dt_Task task = Repository.QueryFirst(x => x.TaskNum == taskNum);
+ // if (task == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
+ // }
- List<Dt_LocationInfo> littleDepthLocations = _basicService.LocationInfoService.GetGroupLocations(locationInfo);
+ // List<Dt_LocationInfo> littleDepthLocations = _basicService.LocationInfoService.GetGroupLocations(locationInfo);
- Dt_LocationInfo? needRelocationItem = littleDepthLocations.Where(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && x.LocationStatus != LocationStatusEnum.FreeLock.ObjToInt() && x.Depth < locationInfo.Depth).OrderBy(x => x.Depth).FirstOrDefault();
+ // Dt_LocationInfo? needRelocationItem = littleDepthLocations.Where(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.LocationStatus != LocationStatusEnum.FreeLock.ObjToInt() && x.Depth < locationInfo.Depth).OrderBy(x => x.Depth).FirstOrDefault();
- if (needRelocationItem == null)
- {
- return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(task));
- }
- else
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == needRelocationItem.LocationCode);
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旇揣浣嶇殑搴撳瓨淇℃伅");
- }
+ // if (needRelocationItem == null)
+ // {
+ // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(task));
+ // }
+ // else
+ // {
+ // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == needRelocationItem.LocationCode);
+ // if (stockInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板搴旇揣浣嶇殑搴撳瓨淇℃伅");
+ // }
- Dt_Task taskTemp = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- if (taskTemp != null)
- {
- return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(taskTemp));
- }
+ // Dt_Task taskTemp = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ // if (taskTemp != null)
+ // {
+ // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(taskTemp));
+ // }
- int heightType = 0;
- if(needRelocationItem.Layer == 5)
- {
- heightType = 3;
- }
- else if(needRelocationItem.Layer == 4)
- {
- heightType = 2;
- }
- else if(needRelocationItem.Layer <= 3 && needRelocationItem.Layer >= 1)
- {
- heightType = 1;
- }
+ // int heightType = 0;
+ // if(needRelocationItem.Layer == 5)
+ // {
+ // heightType = 3;
+ // }
+ // else if(needRelocationItem.Layer == 4)
+ // {
+ // heightType = 2;
+ // }
+ // else if(needRelocationItem.Layer <= 3 && needRelocationItem.Layer >= 1)
+ // {
+ // heightType = 1;
+ // }
- Dt_LocationInfo? newLocation = _basicService.LocationInfoService.AssignLocation(needRelocationItem.RoadwayNo, task.PalletType, task.WarehouseId, needRelocationItem.LocationCode, heightType);
- if (newLocation != null)
- {
- Dt_Task newTask = new Dt_Task()
- {
- Roadway = task.Roadway,
- WarehouseId = task.WarehouseId,
- CurrentAddress = locationCode,
- Grade = 99,
- NextAddress = newLocation.LocationCode,
- OrderNo = "",
- PalletCode = stockInfo.PalletCode,
- PalletType = stockInfo.PalletType,
- SourceAddress = needRelocationItem.LocationCode,
- TargetAddress = newLocation.LocationCode,
- TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = 0,
- TaskType = TaskTypeEnum.Relocation.ObjToInt()
- };
+ // Dt_LocationInfo? newLocation = _basicService.LocationInfoService.AssignLocation(needRelocationItem.RoadwayNo, task.PalletType, task.WarehouseId, needRelocationItem.LocationCode);
+ // if (newLocation != null)
+ // {
+ // Dt_Task newTask = new Dt_Task()
+ // {
+ // Roadway = task.Roadway,
+ // WarehouseId = task.WarehouseId,
+ // CurrentAddress = locationCode,
+ // Grade = 99,
+ // NextAddress = newLocation.LocationCode,
+ // OrderNo = "",
+ // PalletCode = stockInfo.PalletCode,
+ // PalletType = stockInfo.PalletType,
+ // SourceAddress = needRelocationItem.LocationCode,
+ // TargetAddress = newLocation.LocationCode,
+ // TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ // TaskStatus = 0,
+ // TaskType = TaskTypeEnum.Relocation.ObjToInt()
+ // };
- _unitOfWorkManage.BeginTran();
- Repository.AddData(newTask);
- {
- LocationStatusEnum lastStatus = (LocationStatusEnum)newLocation.LocationStatus;
- _basicService.LocationInfoService.UpdateLocationStatus(newLocation, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(newLocation, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
- }
- {
- LocationStatusEnum lastStatus = (LocationStatusEnum)needRelocationItem.LocationStatus;
- _basicService.LocationInfoService.UpdateLocationStatus(needRelocationItem, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(needRelocationItem, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
- }
- stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ // _unitOfWorkManage.BeginTran();
+ // Repository.AddData(newTask);
+ // {
+ // LocationStatusEnum lastStatus = (LocationStatusEnum)newLocation.LocationStatus;
+ // _basicService.LocationInfoService.UpdateLocationStatus(newLocation, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(newLocation, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
+ // }
+ // {
+ // LocationStatusEnum lastStatus = (LocationStatusEnum)needRelocationItem.LocationStatus;
+ // _basicService.LocationInfoService.UpdateLocationStatus(needRelocationItem, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(needRelocationItem, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
+ // }
+ // stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
+ // _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
+ // _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(newTask));
- }
- else
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板彲鍒嗛厤璐т綅,璇锋煡鐪嬭宸烽亾銆恵task.Roadway}銆戞槸鍚﹁繕鏈夌┖闂插彲浣跨敤璐т綅");
- }
- }
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- public WebResponseContent InboundTaskCompleted(Dt_Task task)
- {
- try
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == task.PalletCode);
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�");
- }
- Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- if (locationInfoEnd == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
- }
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- FeedBackWCSTaskCompleted(task.TaskNum);
- _unitOfWorkManage.BeginTran();
- stockInfo.LocationCode = locationInfoEnd.LocationCode;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
+ // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(newTask));
+ // }
+ // else
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板彲鍒嗛厤璐т綅,璇锋煡鐪嬭宸烽亾銆恵task.Roadway}銆戞槸鍚﹁繕鏈夌┖闂插彲浣跨敤璐т綅");
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
public WebResponseContent RelocationTaskCompleted(Dt_Task task)
{
try
@@ -196,5 +169,111 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ public WebResponseContent IsRelocation(string startAddress,string endAddress,string roadWay)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇璐т綅
+ Dt_LocationInfo startLocationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == startAddress);
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.LocationCode == startAddress);
+ Dt_LocationInfo endLocationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == endAddress);
+ //鍒ゆ柇鏉′欢
+ if (startLocationInfo != null && startLocationInfo.LocationStatus==LocationStatusEnum.InStock.ObjToInt() && endLocationInfo != null && endLocationInfo.LocationStatus==LocationStatusEnum.Free.ObjToInt() && endLocationInfo.EnableStatus==EnableStatusEnum.Normal.ObjToInt() && stockInfo!=null)
+ {
+ //鐢熸垚浠诲姟
+ Dt_Task newTask = new Dt_Task()
+ {
+ Roadway = roadWay,
+ WarehouseId = stockInfo.WarehouseId,
+ CurrentAddress = startLocationInfo.LocationCode,
+ Grade = 99,
+ NextAddress = endLocationInfo.LocationCode,
+ OrderNo = "",
+ PalletCode = stockInfo.PalletCode,
+ PalletType = stockInfo.PalletType,
+ SourceAddress = startLocationInfo.LocationCode,
+ TargetAddress = endLocationInfo.LocationCode,
+ TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ TaskStatus = TaskStatusEnum.SC_Execute.ObjToInt(),
+ TaskType = TaskTypeEnum.Relocation.ObjToInt()
+ };
+ stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
+ _unitOfWorkManage.BeginTran();
+ Repository.AddData(newTask);
+ _basicService.LocationInfoService.UpdateLocationStatus(startLocationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ _basicService.LocationInfoService.UpdateLocationStatus(endLocationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(new List<Dt_Task> { newTask });
+ content.OK("鎴愬姛");
+ }
+ else
+ {
+ content.Error("搴撳瓨璐т綅淇℃伅涓虹┖");
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ /// <summary>
+ /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔� todo:涓存椂
+ /// </summary>
+ public WebResponseContent RelocationRoadWay(string roadWay, int Count)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇瀵瑰簲搴撳瓨
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => x.MaterielWide <2200 && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).OrderBy(x => x.CreateDate).Take(Count).ToList();
+
+ //鑾峰彇璐т綅
+ List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
+ foreach (var item in stockInfos)
+ {
+ Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
+ if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
+ {
+ item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ }
+ else
+ {
+ return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
+ }
+ }
+
+ List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutPick);
+ if (tasks == null || tasks.Count <= 0)
+ {
+ return content.Error($"鐢熸垚浠诲姟澶辫触");
+ }
+ tasks.ForEach(x =>
+ {
+ x.TargetAddress = roadWay;
+ });
+ //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
+ _unitOfWorkManage.BeginTran();
+ //鏇存柊搴撳瓨鐘舵��
+ _stockRepository.StockInfoRepository.UpdateData(stockInfos);
+ //鏇存柊璐т綅鐘舵��
+ _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
+ //鍔犲叆璐т綅鍙樺姩璁板綍
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
+ //鏂板缓浠诲姟
+ BaseDal.AddData(tasks);
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(tasks);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3