From 4fc31b41c205507607c91ab3afe10fbc06a9aa09 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期五, 05 十二月 2025 13:52:15 +0800
Subject: [PATCH] 1.添加启动提升机、停止提升机、复位提升机功能 2.优化初始化提升机功能
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1022 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 608 insertions(+), 414 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 5893c7e..2d9ccaa 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -17,6 +17,7 @@
using System.Reflection;
using System.Reflection.Metadata;
using System.Security.Policy;
+using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Cache;
@@ -24,6 +25,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.Stock;
@@ -58,6 +60,8 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
+ private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
+ private readonly IDt_InventoryRecordRepository _inventoryRecordRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -72,7 +76,9 @@
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
ISys_ConfigService configService,
- IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository,
+ IDt_WareAreaInfoRepository wareAreaInfoRepository,
+ IDt_InventoryRecordRepository inventoryRecordRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -87,6 +93,8 @@
_stationManagerRepository = stationManagerRepository;
_configService = configService;
_orderOutDetailsRepository = orderOutDetailsRepository;
+ _wareAreaInfoRepository = wareAreaInfoRepository;
+ _inventoryRecordRepository = inventoryRecordRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -98,8 +106,12 @@
WebResponseContent content = new WebResponseContent();
try
{
- var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
- var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ {
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ }
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -108,18 +120,16 @@
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
stock.ModifyDate = DateTime.Now;
stock.LocationCode = task.TargetAddress;
- var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
List<Dt_OrderOutDetails_Hty> orderdetailshtys = new List<Dt_OrderOutDetails_Hty>();
orderDetails.ForEach(item =>
- {
- orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
- });
-
- var allocateOrderdetail = orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList();
+ {
+ orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
+ });
await ERPAllocateOut(stock);
@@ -143,49 +153,56 @@
if (orderDetails.Count > 0)
{
content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐢熶骇棰嗘枡鍗�).ToList());
- }
- }
- List<DtBoxingInfo> boxingInfos = new List<DtBoxingInfo>();
- foreach (var item in allocateOrderdetail)
- {
- var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == item.PalletCode);
- if (boxingInfo == null)
- {
- continue;
}
- var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode);
- if (boxingdetail.Count() > 0)
- {
- foreach (var detail in boxingdetail)
- {
- detail.Quantity = detail.Quantity - item.OutboundQuantity;
- detail.Warehouse = "WMS鍑哄簱缂撳瓨鍖�";
- detail.WareHouseId = "205";
- }
- }
- boxingInfos.Add(boxingInfo);
}
- await _unitOfWorkManage.UseTranAsync(async () =>
+
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == stock.PalletCode);
+ if (boxingInfo != null)
{
+ var mergedDetails = boxingInfo.BoxingInfoDetails
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtBoxingInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ WareHouseId = "205",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
+ boxingInfo.BoxingInfoDetails = mergedDetails;
+ }
+
+ //await _unitOfWorkManage.UseTranAsync(async () =>
+ //{
+ _unitOfWorkManage.BeginTran();
await DeleteStockInfoAsync(stock.Id);
- _boxingInfoRepository.UpdateDataNav(boxingInfos);
+ _boxingInfoRepository.UpdateDataNav(boxingInfo);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
await AddStockInfoHtyAsync(stockInfo_Hty);
- await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
- await _locationRepository.UpdateDataAsync(result1.Item2);
await _locationRepository.UpdateDataAsync(result2.Item2);
await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- });
+ _unitOfWorkManage.CommitTran();
+ //});
content.OK("鍑哄簱瀹屾垚");
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
task.ErrorMessage = ex.Message;
await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
@@ -216,14 +233,21 @@
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- stock.ModifyDate = DateTime.Now;
- stock.LocationCode = task.TargetAddress;
- var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
+ if (stock != null)
+ {
+ stock.ModifyDate = DateTime.Now;
+ stock.LocationCode = task.TargetAddress;
+ }
+ var result1 = UpdateLocationStatus(locationStart.LocationCode, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticRelocation);
+ var result2 = UpdateLocationStatus(locationEnd.LocationCode, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticRelocation);
await _unitOfWorkManage.UseTranAsync(async () =>
{
- await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
- await _locationRepository.UpdateDataAsync(result.Item2);
- _stockInfoRepository.UpdateData(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
+ if (stock != null)
+ _stockInfoRepository.UpdateData(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
@@ -251,13 +275,20 @@
try
{
var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
- var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
if (boxinfo == null)
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
+
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
+ {
+ var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ }
+
+
var stock = CreateStock(boxinfo, task);
@@ -267,25 +298,24 @@
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
- await ERPAllocate(stock);
-
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await _stockInfoRepository.AddDataNavAsync(stock);
+ //await _unitOfWorkManage.UseTranAsync(async () =>
+ //{
+ _unitOfWorkManage.BeginTran();
+ await _stockInfoRepository.AddDataNavAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
- await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationRepository.UpdateDataAsync(result2.Item2);
- await _locationRepository.UpdateDataAsync(result1.Item2);
- });
+ _unitOfWorkManage.CommitTran();
+ //});
+ await ERPAllocate(boxinfo);
content.OK("鍏ュ簱瀹屾垚");
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
task.ErrorMessage = ex.Message;
await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
@@ -296,7 +326,31 @@
public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
{
var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
+ boxDetail.ForEach(x =>
+ {
+ x.Status = (int)StockStateEmun.宸插叆搴�;
+ });
+ var mergedDetails = boxDetail
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtStockInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ OutboundQuantity = g.FirstOrDefault().OutboundQuantity,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ AllocateWarehouse = g.FirstOrDefault().AllocateWarehouse,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
return new DtStockInfo()
{
PalletCode = task.PalletCode,
@@ -304,69 +358,11 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFullExit = boxingInfo.IsFullExit,
- StockInfoDetails = boxDetail,
+ StockInfoDetails = mergedDetails,
StockStatus = (int)StockStateEmun.宸插叆搴�
};
}
#endregion 鍏ュ簱浠诲姟瀹屾垚
-
- #region AGV鎼繍浠诲姟瀹屾垚
- public async Task<WebResponseContent> CompleteCarryTaskAsync(Dt_Task task,DtStockInfo stockInfo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
- var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
-
- //UpdateLocationStatus(Sourcelocation, LocationEnum.Free);
- //UpdateLocationStatus(Targetlocation, LocationEnum.InStock);
-
- task.TaskState = (int)TaskAGVCarryStatusEnum.CarryFinish;
- var taskHty = task.Adapt<Dt_Task_Hty>();
- taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
- taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await DeleteTaskAsync(task.TaskId);
- await AddTaskHtyAsync(taskHty);
- });
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- return content;
- }
-
- #endregion
-
- #region AGV璺ㄦゼ灞備换鍔″畬鎴�
- public async Task<WebResponseContent> CompleteAcrossFloorTaskAsync(Dt_Task task, DtStockInfo stockInfo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryFinish;
- var taskHty = task.Adapt<Dt_Task_Hty>();
- taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
- taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await DeleteTaskAsync(task.TaskId);
- await AddTaskHtyAsync(taskHty);
- });
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- return content;
- }
-
- #endregion
#region 浠诲姟瀹屾垚
@@ -456,6 +452,12 @@
WebResponseContent content = new WebResponseContent();
try
{
+ var task = BaseDal.QueryFirst(x => x.PalletCode == taskDto.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡缁忓瓨鍦ㄤ换鍔★紝璇峰嬁閲嶅涓嬪彂");
+ }
+
var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
if (boxingInfo == null)
@@ -463,14 +465,14 @@
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
}
- foreach (var item in boxingInfo.BoxingInfoDetails)
- {
- var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
- if (ERPStock == null)
- {
- return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
- }
- }
+ //foreach (var item in boxingInfo.BoxingInfoDetails)
+ //{
+ // var ERPStock = SqlSugarHelper.DBERP.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
+ // if (ERPStock == null)
+ // {
+ // return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
+ // }
+ //}
var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
if (StartAddress == null)
@@ -482,72 +484,54 @@
return content.Error($"璧风偣搴撲綅{StartAddress.LocationCode}鎼繍璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
}
Dt_Task taskNew = new Dt_Task();
- DtLocationInfo Endlocation= new DtLocationInfo();
- if (taskDto.AreaId != 0)
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == taskDto.AreaId);
+ if (area == null)
{
- switch (taskDto.AreaId)
- {
- case 1:
- Endlocation = await GetEmptyLocation("SC1");
- taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
- break;
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- Endlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
- taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
- break;
- default:
- return content.Error("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
- }
+ return content.Error("璇烽�夋嫨鍏ュ簱鍖哄煙");
}
- else if (taskDto.TargetAddress != null)
+
+ var locationInfo = await _locationRepository.QueryDataAsync(x => x.AreaId == area.AreaID && x.EnalbeStatus == 1 && x.LocationStatus == (int)LocationEnum.Free);
+
+ var taskArea = BaseDal.QueryData(x => x.TargetAddress == area.AreaName && x.TaskType == (int)TaskInboundTypeEnum.Inbound);
+
+ if (locationInfo.Count - taskArea.Count <= 0)
{
- Endlocation = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
- if (Endlocation != null && Endlocation.LocationStatus == (int)LocationEnum.Free && Endlocation.EnalbeStatus == 1)
- {
- switch (Endlocation.AreaId)
- {
- case 1:
- taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
- break;
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
- break;
- default:
- return content.Error("璐т綅鍖哄煙鏈壘鍒�");
- }
- }
- else
- {
- return content.OK("鐩爣搴撲綅涓嶅彲鐢�");
- }
+ return content.Error("璇ュ尯鍩熸棤鍙敤搴撲綅锛岃閫夋嫨鍏朵粬鍖哄煙");
}
- else
+
+ switch (taskDto.AreaId)
{
- return content.Error("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ case 1:
+ taskNew = InboundStakerArea(taskDto, StartAddress, area);
+ break;
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ taskNew = InboundAGVCacheArea(taskDto, StartAddress, area);
+ break;
+ default:
+ return content.Error("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
}
var taskDTO = CreateListTaskDTO(taskNew);
-
- var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+
+ var result = UpdateLocationStatus(StartAddress.LocationCode, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
- await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
- await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
- await _locationRepository.UpdateDataAsync(result1.Item2);
- await _locationRepository.UpdateDataAsync(result2.Item2);
+ if (taskDto.AreaId == 3 || taskDto.AreaId == 7)
+ {
+ var result2 = UpdateLocationStatus(taskNew.TargetAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
+ }
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
BaseDal.AddData(taskNew);
});
return content = await SendWCSTask(taskDTO);
- //return content.OK("鎴愬姛");
}
catch (Exception err)
{
@@ -555,18 +539,15 @@
}
}
- public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,DtLocationInfo EndLocation)
+ public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,Dt_AreaInfo area)
{
var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
- if (EndLocation == null)
- {
- throw new Exception("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
+
return new Dt_Task
{
Grade = 1,
Roadway = "SC1",
- TargetAddress = EndLocation.LocationCode,
+ TargetAddress = area.AreaName,
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = station.stationChildCode,
@@ -584,22 +565,18 @@
};
}
- public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
{
WebResponseContent content = new WebResponseContent();
- if (location == null)
- {
- throw new Exception("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
Dt_Task taskNew = new Dt_Task();
- if (StartAddress.Floor != location.Floor)
+ if (StartAddress.Floor != area.Spare1)
{
- taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
+ taskNew = RequestAcrossFloorTask(StartAddress, area, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
else
{
- taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
+ taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(area.AreaID, StartAddress).Result, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
return taskNew;
@@ -637,47 +614,6 @@
return content;
}
- public async Task<WebResponseContent> RequestLocationAsync(RequestTaskDto input)
- {
- await _semaphoreUpdate.WaitAsync();
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == input.PalletCode);
- if (task == null)
- {
- return content.Error("浠诲姟瀵硅薄涓虹┖");
- }
-
- task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
- var location = await GetEmptyLocation(task.Roadway);
- if (location == null)
- {
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
- int beforeStatus = location.LocationStatus;
-
- location.LocationStatus = (int)LocationEnum.Lock;
- task.CurrentAddress = input.Position;
- task.TargetAddress = location.LocationCode;
- task.NextAddress = location.LocationCode;
- task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
- // 寮�濮嬩簨鍔�
- var isResult = await UpdateTaskAsync(task, location, beforeStatus);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏇存柊浠诲姟澶辫触");
- }
- return content.OK(data: task);
- }
- catch (Exception)
- {
- throw;
- }
- finally { _semaphoreUpdate.Release(); }
- }
-
#endregion
#region 璇锋眰鍑哄簱
@@ -686,7 +622,7 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark,int doubleTray)
{
WebResponseContent content = new WebResponseContent();
try
@@ -713,14 +649,28 @@
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound, DoubleTray= doubleTray });
+ List<Dt_InventoryRecord> records = new List<Dt_InventoryRecord>();
+ stcok.StockInfoDetails.ForEach(x =>
+ {
+ records.Add(new Dt_InventoryRecord()
+ {
+ PalletCode = stcok.PalletCode,
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ Quantity = x.Quantity,
+ Status = (int)InventoryStatus.Normal,
+ Remark = remark,
+ });
+ });
var taskDto = CreateListTaskDTO(taskNew);
- var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound, location);
await _unitOfWorkManage.UseTranAsync(async () =>
{
- BaseDal.AddData(taskNew);
- _stockInfoRepository.UpdateData(stcok);
+ await BaseDal.AddDataAsync(taskNew);
+ await _inventoryRecordRepository.AddDataAsync(records);
+ await _stockInfoRepository.UpdateDataAsync(stcok);
await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
await _locationRepository.UpdateDataAsync(result.Item2);
});
@@ -732,6 +682,12 @@
}
}
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
public async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
{
@@ -762,6 +718,10 @@
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
{
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
outDetails.Add(new Dt_OrderOutDetails()
{
OrderNo = "",
@@ -780,7 +740,7 @@
stock.StockInfoDetails = details;
var taskDto = CreateListTaskDTO(taskNew);
- var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound, stock.LocationInfo);
await _unitOfWorkManage.UseTranAsync(async () =>
{
await BaseDal.AddDataAsync(taskNew);
@@ -793,7 +753,7 @@
}
catch (Exception ex)
{
- return content.Error();
+ return content.Error(ex.Message);
}
}
@@ -826,15 +786,23 @@
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutAllocate });
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
- details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ details.Where(x=>x.OutboundQuantity>0).ForEach(x =>
{
- var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
- if (areaName == null)
+ if (x.Quantity < x.OutboundQuantity)
{
- throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ var wareinfo = _wareAreaInfoRepository.QueryFirst(y => y.WareAreaCode ==x.AllocateWarehouse);
+ if (wareinfo == null)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.AllocateWarehouse}鏁版嵁");
+ }
+ if (wareinfo.WareAreaCode == "205")
+ {
+ throw new Exception($"涓嶅彲璋冩嫧鑷砏MS鍑哄簱缂撳瓨鍖簕x.AllocateWarehouse}鏁版嵁");
}
outDetails.Add(new Dt_OrderOutDetails()
{
@@ -844,10 +812,10 @@
ERPOrderId = "",
MaterielCode = x.MaterielCode,
MaterielName = x.MaterielName,
- AllocateWarehouse = x.Remark,
+ AllocateWarehouse = wareinfo.WareAreaName,
Warehouse = "鏅鸿兘绔嬪簱",
WareHouseId = "107",
- AllocateWarehouseId = areaName.AreaName,
+ AllocateWarehouseId = wareinfo.WareAreaCode ,
OutboundQuantity = x.OutboundQuantity,
});
});
@@ -855,7 +823,7 @@
stock.StockInfoDetails = details;
var taskDto = CreateListTaskDTO(taskNew);
- var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound, stock.LocationInfo);
await _unitOfWorkManage.UseTranAsync(async () =>
{
await BaseDal.AddDataAsync(taskNew);
@@ -868,40 +836,27 @@
}
catch (Exception ex)
{
- return content.Error();
+ return content.Error(ex.Message);
}
}
- public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task,int StatusChangeTypeEnum)
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task, StatusChangeTypeEnum StatusChangeTypeEnum, DtLocationInfo location)
{
List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
List<DtLocationInfo> locations = new List<DtLocationInfo>();
- var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, StatusChangeTypeEnum);
- var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, StatusChangeTypeEnum);
- locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
- locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
+ var result = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum);
+ locationStatusChangeRecords.AddRange(result.Item1);
+ locations.AddRange(result.Item2);
+
+ if(location.AreaId ==3|| location.AreaId == 7)
+ {
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, (int)StatusChangeTypeEnum);
+ locationStatusChangeRecords.AddRange(result2.Item1);
+ locations.AddRange(result2.Item2);
+ }
return (locationStatusChangeRecords,locations);
}
-
- public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) GetlcoationState(List<Dt_Task> tasks, int StatusChangeTypeEnum)
- {
- List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
- List<DtLocationInfo> locations = new List<DtLocationInfo>();
- foreach (var item in tasks)
- {
- var result1 = UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, StatusChangeTypeEnum);
- var result2 = UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum);
- locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
- locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
- }
- return (locationStatusChangeRecords, locations);
- }
-
/// <summary>
/// 璇锋眰鍑哄簱浠诲姟
@@ -923,68 +878,46 @@
}
if (!LocationIsOutBound(StartAddress))
{
- throw new Exception($"璧风偣搴撲綅{StartAddress.LocationCode}鍑哄簱璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
+ throw new Exception($"璧风偣搴撲綅{StartAddress.LocationCode}鍑哄簱璺緞琚崰鐢紝璇风◢鍚庨噸璇�");
}
- DtLocationInfo location = null;
- if (taskDto.AreaId != 0)
- {
- if (taskDto.AreaId == 1)
- {
- location = await GetEmptyLocation("SC1");
- }
- else
- {
- location = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
- }
- }
- else if (taskDto.TargetAddress != null)
- {
- location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
- if (location != null && location.LocationStatus != (int)LocationEnum.Free && location.EnalbeStatus == 1)
- {
- throw new Exception("鐩爣搴撲綅涓嶅彲鐢�");
- }
- }
- else
+ var locationInfo = await _locationRepository.QueryDataAsync(x => x.AreaId == area.AreaID && x.EnalbeStatus == 1 && x.LocationStatus == (int)LocationEnum.Free);
+
+ var taskArea = BaseDal.QueryData(x => x.TargetAddress == area.AreaName && x.TaskType == (int)TaskInboundTypeEnum.Inbound);
+
+ if (locationInfo.Count - taskArea.Count <= 0)
{
- throw new Exception("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ throw new Exception($"鍑哄簱缂撳瓨鍖烘棤鍙敤搴撲綅锛岃娓呯悊搴撲綅鍚庡啀璇�");
}
+
switch (StartAddress.AreaId)
{
case 1:
- return OutboundStakerArea(taskDto, StartAddress, location);
+ return OutboundStakerArea(taskDto, StartAddress, area);
case 2:
case 3:
case 4:
case 5:
case 6:
- return OutboundAGVCacheArea(taskDto, StartAddress, location);
+ case 7:
+ return OutboundAGVCacheArea(taskDto, StartAddress, area);
default:
throw new Exception("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
}
}
- public Dt_Task OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
{
var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
- if (location == null)
- {
- throw new Exception("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
-
- if (location.AreaId == 5 || location.AreaId == 6)
- {
- throw new Exception("褰撳墠鍖哄煙涓嶅彲鍑哄簱锛岃鑱旂郴绠＄悊鍛�");
- }
return new Dt_Task
{
Grade = Convert.ToInt32(StartAddress.Remark),
Roadway = "SC1",
- TargetAddress = location.LocationCode,
+ TargetAddress = area.AreaName,
Dispatchertime = DateTime.Now,
MaterialNo = taskDto.MaterielCode,
NextAddress = station.stationChildCode,
@@ -1002,25 +935,89 @@
};
}
- public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
{
- if (location == null)
- {
- throw new Exception("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
Dt_Task taskNew = new Dt_Task();
- if (StartAddress.Floor != location.Floor)
+ if (StartAddress.Floor != area.Spare1)
{
- taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto);
+ taskNew = RequestAcrossFloorTask(StartAddress, area, taskDto.TaskType, taskDto);
}
else
{
- taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto);
+ taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress).Result, taskDto.TaskType, taskDto);
}
return taskNew;
}
#endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
+
+ #region 璇锋眰绉诲簱浠诲姟
+ public async Task<WebResponseContent> RequestRelocationTaskAsync(string SourceAddress,string TargetAddress)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var startLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == SourceAddress);
+ var endLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == TargetAddress);
+
+ if (!startLocation.IsNotEmptyOrNull() || !endLocation.IsNotEmptyOrNull())
+ {
+ return content.Error("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+ if (endLocation.LocationStatus != (int)LocationEnum.Free)
+ {
+ return content.Error($"缁堢偣搴撲綅{endLocation.LocationCode}鏈浜庣┖闂茬姸鎬侊紝璇蜂汉宸ョ‘璁ゅ簱浣嶇姸鎬�");
+ }
+ if ((startLocation.AreaId == 1 || endLocation.AreaId == 1) && startLocation.AreaId != endLocation.AreaId)
+ {
+ return content.Error("绉诲簱璧风偣搴撲綅涓庣粓鐐瑰簱浣嶄笉鍦ㄥ悓涓�鍖哄煙");
+ }
+ if (startLocation.Floor != endLocation.Floor)
+ {
+ return content.Error("绉诲簱璧风偣搴撲綅涓庣粓鐐瑰簱浣嶄笉鍦ㄥ悓涓�妤煎眰");
+ }
+
+ var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == startLocation.LocationCode);
+ var taskNew = new Dt_Task
+ {
+ Grade = startLocation.Floor == "1F" ? 10 : 1,
+ Roadway = endLocation.RoadwayNo,
+ TargetAddress = endLocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = endLocation.LocationCode,
+ OrderNo = null,
+ PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
+ SourceAddress = startLocation.LocationCode,
+ CurrentAddress = startLocation.LocationCode,
+ TaskState = startLocation.AreaId == 1 ? (int)TaskRelocationStatusEnum.RelocationNew : (int)TaskRelocationStatusEnum.RelocationNewAGV,
+ TaskType = (int)TaskRelocationTypeEnum.Relocation,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = startLocation.Floor,
+ };
+
+
+ var result = AddTaskAsync(new List<Dt_Task>() { taskNew });
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item2);
+ await _locationRepository.UpdateDataAsync(result.Item1);
+ await BaseDal.AddDataAsync(taskNew);
+ });
+ await SendWCSTask(CreateListTaskDTO(taskNew));
+ return content.OK("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion
#region 璇锋眰璺ㄦゼ灞�2浠诲姟
/// <summary>
@@ -1045,14 +1042,15 @@
{
stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
}
+ content = await RequestLocation(taskDto.PalletCode);
Dt_Task taskNew = new Dt_Task
{
Grade = 1,
Roadway = "AGV",
- TargetAddress = task.TargetAddress,
+ TargetAddress = content.Data.ToString(),
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = task.TargetAddress,
+ NextAddress = content.Data.ToString(),
OrderNo = null,
PalletCode = task.PalletCode,
SourceAddress = task.SourceAddress,
@@ -1071,9 +1069,10 @@
taskHty.FinishTime = DateTime.Now;
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+
+ await UpdateStartLocationInfo(taskNew);
await _unitOfWorkManage.UseTranAsync(async () =>
{
-
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
BaseDal.AddData(taskNew);
@@ -1089,7 +1088,7 @@
#endregion
#region 璇锋眰璺ㄦゼ灞備换鍔�
- public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
+ public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, Dt_AreaInfo area, int TaskType, RequestTaskDto taskDto)
{
WebResponseContent content = new WebResponseContent();
@@ -1098,7 +1097,7 @@
{
Grade = StartAddress.Column,
Roadway = "AGV",
- TargetAddress = EndAddress.LocationCode,
+ TargetAddress = area.AreaName,
Dispatchertime = DateTime.Now,
MaterialNo = taskDto.MaterielCode,
NextAddress = next.stationChildCode,
@@ -1114,6 +1113,7 @@
Remark = StartAddress.AreaId.ToString(),
AGVTaskNum = GenerateUniqueId(),
Floor = StartAddress.Floor,
+ DoubleTray = taskDto.DoubleTray,
};
}
@@ -1183,16 +1183,20 @@
{
return content.Error($"涓�娣变綅寮傚父閿佸畾鏆備笉鍙嚭搴�");
}
- else if (locationLateral != null && locationLateral.LocationStatus == (int)LocationEnum.InStockDisable && locationLateral.EnalbeStatus == 1)
+ else if (locationLateral != null && (locationLateral.LocationStatus == (int)LocationEnum.InStockDisable|| locationLateral.LocationStatus == (int)LocationEnum.InStock) && locationLateral.EnalbeStatus == 1)
{
+ var taskLateral = BaseDal.QueryFirst(x => x.SourceAddress == locationLateral.LocationCode);
+ if (taskLateral != null)
+ {
+ return content.OK(data: _mapper.Map<WMSTaskDTO>(taskLateral));
+ }
+
var TargetAddress = await GetEmptyLocation("SC1");
if (TargetAddress == null)
{
return content.Error($"鏈壘鍒板彲鍒嗛厤璐т綅,璇锋煡鐪嬫槸鍚﹁繕鏈夌┖闂插彲浣跨敤璐т綅");
}
-
- //todo鏌ヨ鍐呬晶搴撳瓨淇℃伅
var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == locationLateral.LocationCode);
Dt_Task taskNew = new Dt_Task
@@ -1204,7 +1208,7 @@
MaterialNo = "",
NextAddress = TargetAddress.LocationCode,
OrderNo = null,
- PalletCode = stock.PalletCode,
+ PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
SourceAddress = locationLateral.LocationCode,
CurrentAddress = locationLateral.LocationCode,
TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1217,8 +1221,6 @@
var taskDTO = CreateListTaskDTO(taskNew);
var isResult = await AddTaskAsync(taskNew, locationLateral, TargetAddress);
- //UpdateLocationStatus(TargetAddress, LocationEnum.Lock);
- UpdateLocationStatus(TargetAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
if (!isResult)
{
_unitOfWorkManage.RollbackTran();
@@ -1252,12 +1254,13 @@
if (location == null)
{
- return content.Error("鏈壘鍒拌揣浣嶆垨鑰呰搴撲綅涓嶆槸浜屾繁璐т綅");
+ return content.Error($"鏈壘鍒拌揣浣嶄俊鎭瘂taskDto.Position}");
}
List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
switch (location.AreaId)
{
case 2:
+ case 7:
locationInfos = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark && x.AreaId == location.AreaId);
break;
case 5:
@@ -1274,14 +1277,14 @@
}
List<WMSTaskDTO> taskDTO = new List<WMSTaskDTO>();
-
+ List<Dt_Task> taskNew = new List<Dt_Task>();
foreach (var item in locationInfos)
{
- if ((item.LocationStatus == 0 || item.LocationStatus == (int)LocationEnum.FreeDisable) && item.EnalbeStatus == 1)
+ if(item.LocationStatus == (int)LocationEnum.Lock)
{
- continue;
+ return content.Error($"{item.LocationCode}璺緞琚崰鐢紝璇风◢鍚庡啀璇�");
}
- else
+ if ((item.LocationStatus == (int)LocationEnum.InStockDisable || item.LocationStatus == (int)LocationEnum.InStock) && item.EnalbeStatus == 1)
{
DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(item.AreaId, item);
@@ -1289,41 +1292,51 @@
{
return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
}
- //todo鏌ヨ绉诲簱搴撳瓨淇℃伅
+ var stock = _stockInfoRepository.QueryFirst(x => x.LocationCode == item.LocationCode);
- Dt_Task taskNew = new Dt_Task
+ var Relocationtask = BaseDal.QueryFirst(x => x.SourceAddress == item.LocationCode);
+
+ if (Relocationtask != null)
{
- Grade = item.Column,
- Roadway = "AGV",
- TargetAddress = Targetlocation.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = Targetlocation.LocationCode,
- OrderNo = null,
- PalletCode = _random.Next(0, 10000).ToString(),
- SourceAddress = item.LocationCode,
- CurrentAddress = item.LocationCode,
- TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = (int)TaskRelocationTypeEnum.Relocation,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = item.Floor,
- Remark = item.AreaId.ToString(),
- };
- taskDTO.Add(CreateTaskDTO(taskNew));
-
- var isResult = await AddTaskAsync(taskNew, item, Targetlocation);
- UpdateLocationStatus(Targetlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
+ taskDTO.Add(CreateTaskDTO(Relocationtask));
+ continue;
}
-
+ else
+ {
+ taskNew.Add(new Dt_Task
+ {
+ Grade = item.Column,
+ Roadway = "AGV",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = Targetlocation.LocationCode,
+ OrderNo = null,
+ PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
+ SourceAddress = item.LocationCode,
+ CurrentAddress = item.LocationCode,
+ TaskState = (int)TaskRelocationStatusEnum.RelocationNewAGV,
+ TaskType = (int)TaskRelocationTypeEnum.Relocation,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = item.Floor,
+ Remark = item.AreaId.ToString(),
+ });
+ }
+
}
}
+ taskDTO = CreateTaskDTO(taskNew);
+
+ var result = AddTaskAsync(taskNew);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item2);
+ await _locationRepository.UpdateDataAsync(result.Item1);
+ await BaseDal.AddDataAsync(taskNew);
+ });
return content.OK(data: taskDTO);
}
catch (Exception ex)
@@ -1332,6 +1345,83 @@
}
}
+
+ #endregion
+
+ #region 鏇存柊璧风偣璐т綅淇℃伅
+ public async Task<WebResponseContent> UpdateStartLocationInfo(Dt_Task task)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (task == null)
+ return content.OK();
+ var result = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup ? (int)StatusChangeTypeEnum.AutomaticOutbound : (int)StatusChangeTypeEnum.AutomaticInbound);
+
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion
+
+ #region 鑾峰彇缁堢偣璐т綅淇℃伅
+ public async Task<WebResponseContent> RequestLocation(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+ var areaInfo = await _areaInfoRepository.QueryFirstAsync(x => x.AreaName == task.TargetAddress);
+ if (areaInfo == null)
+ return content.Error($"鏈壘鍒扮粓鐐瑰尯鍩熶俊鎭瘂task.TargetAddress}璇疯仈绯荤鐞嗗憳");
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ DtLocationInfo locationInfo = new DtLocationInfo();
+ switch (areaInfo.AreaID)
+ {
+ case 1:
+ locationInfo = await GetEmptyLocation("SC1");
+ break;
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ locationInfo = await GetAGVEmptyCacheLocation(areaInfo.AreaID, location);
+ break;
+ default:
+ return content.Error("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
+ }
+ if (locationInfo == null)
+ {
+ return content.Error("鏈壘鍒板彲鍒嗛厤璐т綅,璇锋煡鐪嬫槸鍚﹁繕鏈夌┖闂插彲浣跨敤璐т綅");
+ }
+ task.CurrentAddress = task.NextAddress;
+ task.TargetAddress = locationInfo.LocationCode;
+ task.NextAddress = locationInfo.LocationCode;
+
+ var result = UpdateLocationStatus(locationInfo.LocationCode, LocationEnum.Lock, task.TaskNum.Value, task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup ? StatusChangeTypeEnum.AutomaticOutbound : StatusChangeTypeEnum.AutomaticInbound);
+ await BaseDal.UpdateDataAsync(task);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+
+ return content.OK(data: locationInfo.LocationCode);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
#endregion
@@ -1441,7 +1531,7 @@
{
PickListID = item.ERPOrderId,
//瀛樺偍鍦扮偣
- WhCode = item.WareHouseId,
+ WhCode = "205",
//棰嗘枡鏁伴噺
IssueQty = item.OutboundQuantity,
}).ToList()
@@ -1470,13 +1560,13 @@
/// <param name="palletCode"></param>
/// <returns></returns>
///
- public async Task ERPAllocate(DtStockInfo stock)
+ public async Task ERPAllocate(DtBoxingInfo boxing)
{
try
{
- if (stock == null)
+ if (boxing == null)
{
- throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ throw new Exception("鏈壘鍒扮粍鐩樹俊鎭�");
}
Allocate allocate = new Allocate
{
@@ -1491,7 +1581,7 @@
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
- transferInList = stock.StockInfoDetails.Select(item => new transferInList
+ transferInList = boxing.BoxingInfoDetails.Select(item => new transferInList
{
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
@@ -1546,11 +1636,11 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = "107",
+ TransInWHCode = "205",
//璋冨叆鏁伴噺
TransInQty = item.Quantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = "205",
+ TransOutWHCode = "107",
}).ToList()
};
var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
@@ -1580,20 +1670,28 @@
throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
}
List<transferInList> transferInList=new List<transferInList>();
- orderOutDetails.ForEach(x =>
+ foreach (var item in orderOutDetails)
{
+ if (item.AllocateWarehouseId == "205")
+ {
+ continue;
+ }
transferInList.Add(new transferInList
{
//鐗╂枡缂栫爜
- ItemCode = x.MaterielCode,
+ ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = x.AllocateWarehouseId,
+ TransInWHCode = item.AllocateWarehouseId,
//璋冨叆鏁伴噺
- TransInQty = x.OutboundQuantity,
+ TransInQty = item.OutboundQuantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = x.WareHouseId,
+ TransOutWHCode = "205",
});
- });
+ }
+ if (transferInList.Count <= 0)
+ {
+ return;
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1645,7 +1743,7 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "MiscShip001",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
@@ -1654,9 +1752,10 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.WareHouseId,
+ WhCode = "205",
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
+
BenefitDeptCode = "0505",
}).ToList()
};
@@ -1836,9 +1935,6 @@
changeRecordDto.Add(dtLocationStatusChangeRecord);
}
}
- //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
-
- //_locationRepository.UpdateData(locations);
return (changeRecordDto,locations);
}
@@ -1863,20 +1959,12 @@
{
item.LocationStatus = (int)LocationEnum.Lock;
}
- else if (item.LocationStatus == (int)LocationEnum.Free)
- {
- item.LocationStatus = (int)LocationEnum.FreeDisable;
- }
}
else if (locationStatus == LocationEnum.InStock)
{
if (item.LocationCode == location.LocationCode)
{
item.LocationStatus = (int)LocationEnum.InStock;
- }
- else if (item.LocationStatus == (int)LocationEnum.FreeDisable)
- {
- item.LocationStatus = (int)LocationEnum.Free;
}
}
else if (locationStatus == LocationEnum.InStockDisable)
@@ -1885,21 +1973,10 @@
{
item.LocationStatus = (int)LocationEnum.InStockDisable;
}
- else if (item.LocationStatus == (int)LocationEnum.Free)
- {
- item.LocationStatus = (int)LocationEnum.FreeDisable;
- }
}
else if (locationStatus == LocationEnum.Free)
{
- if (item.LocationCode == location.LocationCode)
- {
- item.LocationStatus = (int)LocationEnum.Free;
- }
- else if (item.LocationStatus == (int)LocationEnum.FreeDisable || item.LocationStatus == (int)LocationEnum.InStockDisable)
- {
- item.LocationStatus = (int)LocationEnum.Free;
- }
+ item.LocationStatus = (int)LocationEnum.Free;
}
}
List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
@@ -1922,10 +1999,54 @@
changeRecordDto.Add(dtLocationStatusChangeRecord);
}
}
- //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
-
- //_locationRepository.UpdateData(locations);
return (changeRecordDto, locations);
+ }
+
+ public (DtLocationStatusChangeRecord, DtLocationInfo) UpdateEndLocationStatus(string locationCode, LocationEnum locationStatus, int taskNum, StatusChangeTypeEnum StatusChangeType)
+ {
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == locationCode);
+
+ if (location != null && (location.AreaId == 3 || location.AreaId == 7))
+ {
+ int Beforelocation = location.LocationStatus;
+
+ location.LocationStatus = (int)locationStatus;
+
+ DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
+ {
+ ChangeType = (int)StatusChangeType,
+ LocationCode = locationCode,
+ LocationId = location.Id,
+ Creater = "System",
+ TaskNum = taskNum,
+ AfterStatus = location.LocationStatus,
+ BeforeStatus = Beforelocation,
+ };
+
+ return (dtLocationStatusChangeRecord, location);
+ }
+ return (null, null);
+ }
+
+ public (DtLocationStatusChangeRecord, DtLocationInfo) UpdateLocationStatus(string locationCode, LocationEnum locationStatus, int taskNum, StatusChangeTypeEnum StatusChangeType)
+ {
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == locationCode);
+ int Beforelocation = location.LocationStatus;
+
+ location.LocationStatus = (int)locationStatus;
+
+ DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
+ {
+ ChangeType = (int)StatusChangeType,
+ LocationCode = locationCode,
+ LocationId = location.Id,
+ Creater = "System",
+ TaskNum = taskNum,
+ AfterStatus = location.LocationStatus,
+ BeforeStatus = Beforelocation,
+ };
+
+ return (dtLocationStatusChangeRecord, location);
}
public List<DtLocationInfo> GetGroupLocations(DtLocationInfo location)
@@ -1943,7 +2064,7 @@
}
}
}
- else if (location.AreaId == 2)
+ else if (location.AreaId == 2 || location.AreaId == 7)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);
if (locationLateral.Count > 0)
@@ -1979,7 +2100,9 @@
TaskState = task.TaskState,
Id = 0,
TaskType = task.TaskType,
+ Floor =task.Floor,
AGVTaskNum = task.AGVTaskNum,
+ DoubleTray = task.DoubleTray,
} };
}
@@ -1997,8 +2120,35 @@
Id = 0,
TaskType = task.TaskType,
AGVTaskNum = task.AGVTaskNum,
- Remark= task.Remark
+ Remark = task.Remark,
+ Floor = task.Floor,
+ DoubleTray = task.DoubleTray,
};
+ }
+ private List<WMSTaskDTO> CreateTaskDTO(List<Dt_Task> task)
+ {
+ List<WMSTaskDTO> taskNews = new List<WMSTaskDTO>();
+ foreach (var item in task)
+ {
+ taskNews.Add(new WMSTaskDTO
+ {
+ TaskNum = item.TaskNum.Value,
+ Grade = item.Grade.Value,
+ PalletCode = item.PalletCode,
+ RoadWay = item.Roadway,
+ SourceAddress = item.SourceAddress,
+ TargetAddress = item.TargetAddress,
+ TaskState = item.TaskState,
+ Id = 0,
+ TaskType = item.TaskType,
+ AGVTaskNum = item.AGVTaskNum,
+ Remark = item.Remark,
+ Floor = item.Floor,
+ DoubleTray = item.DoubleTray,
+ });
+ }
+
+ return taskNews;
}
private async Task DeleteStockInfoAsync(int stockId)
@@ -2162,7 +2312,6 @@
private async Task<bool> AddTaskAsync(Dt_Task task, DtLocationInfo StartAddress, DtLocationInfo EndAddress)
{
- //UpdateLocationStatus
bool isResult = await BaseDal.AddDataAsync(task) > 0;
int SourcebeforeStatus = StartAddress.LocationStatus;
@@ -2181,7 +2330,7 @@
TaskNum = task.TaskNum.Value,
LocationId = StartAddress.Id,
LocationCode = StartAddress.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
},
new LocationChangeRecordDto()
{
@@ -2190,7 +2339,7 @@
TaskNum = task.TaskNum.Value,
LocationId = EndAddress.Id,
LocationCode = EndAddress.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
},
};
@@ -2199,6 +2348,46 @@
bool Target = await _locationRepository.UpdateDataAsync(EndAddress);
return isResult && Source && Target;
+ }
+
+ private (List<DtLocationInfo>,List<DtLocationStatusChangeRecord>) AddTaskAsync(List<Dt_Task> task)
+ {
+ List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
+ List<DtLocationInfo> locationos = new List<DtLocationInfo>();
+ foreach (var item in task)
+ {
+ var SourceAddress = _locationRepository.QueryFirst(x => x.LocationCode == item.SourceAddress);
+ var TargetAddress = _locationRepository.QueryFirst(x => x.LocationCode == item.TargetAddress);
+ int SourcebeforeStatus = SourceAddress.LocationStatus;
+
+ int TargetbeforeStatus = TargetAddress.LocationStatus;
+
+ SourceAddress.LocationStatus = (int)LocationEnum.InStockDisable;
+ TargetAddress.LocationStatus = (int)LocationEnum.Lock;
+ changeRecordDto.Add(new DtLocationStatusChangeRecord()
+ {
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
+ LocationCode = TargetAddress.LocationCode,
+ LocationId = TargetAddress.Id,
+ Creater = "System",
+ TaskNum = item.TaskNum,
+ AfterStatus = TargetAddress.LocationStatus,
+ BeforeStatus = TargetbeforeStatus,
+ });
+ changeRecordDto.Add(new DtLocationStatusChangeRecord
+ {
+ AfterStatus = TargetAddress.LocationStatus,
+ BeforeStatus = TargetbeforeStatus,
+ TaskNum = item.TaskNum.Value,
+ Creater = "System",
+ LocationId = TargetAddress.Id,
+ LocationCode = TargetAddress.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
+ });
+ locationos.Add(TargetAddress);
+ locationos.Add(SourceAddress);
+ }
+ return (locationos, changeRecordDto);
}
/// <summary>
@@ -2252,6 +2441,7 @@
switch (AreaId)
{
case 2:
+ case 7:
return await FromShallowToDeep(AreaId, loc);
case 3:
return await AGVLIKU(AreaId);
@@ -2288,6 +2478,11 @@
foreach (var item in locations)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
+ if (locationLateral.Count == 0)
+ {
+ locationInfos.Add(item);
+ continue;
+ }
bool Isavailable = true;
foreach (var lateral in locationLateral)
{
@@ -2335,17 +2530,18 @@
locationInfos.Add(item);
continue;
}
- foreach (var Lateral in locationLateral)
+ bool Isavailable = true;
+ foreach (var lateral in locationLateral)
{
- if (locationInfos.Contains(Lateral))
- continue;
- if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
+ if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
{
- locationInfos.Add(item);
+ Isavailable = false;
+ continue;
}
}
+ if (Isavailable)
+ locationInfos.Add(item);
}
-
return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
}
@@ -2364,8 +2560,6 @@
public bool LocationIsOutBound(DtLocationInfo location)
{
-
- int sum = 0;
if (location.AreaId == 1)
{
if (location.Depth == 2)
@@ -2379,7 +2573,7 @@
}
}
- else if (location.AreaId == 2)
+ else if (location.AreaId == 2 || location.AreaId == 7)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);
--
Gitblit v1.9.3