From aa201fcecc1ce93da4f660a833f7b1176fc037cb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 02 十二月 2025 18:04:54 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 2089 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 1,403 insertions(+), 686 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 ede4e60..a6376fd 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"
@@ -3,13 +3,16 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using NewLife;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
@@ -21,6 +24,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;
@@ -30,6 +34,9 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.ERP;
+using WIDESEA_Model.Models.Order;
+using WIDESEA_OrderRepository;
+using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
using static System.Collections.Specialized.BitVector32;
@@ -51,8 +58,9 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
- private readonly IDt_OutboundOrderRepository _outorderRepository;
- private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
+ private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
+ private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
+ private readonly IDt_InventoryRecordRepository _inventoryRecordRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -67,8 +75,9 @@
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
ISys_ConfigService configService,
- IDt_OutboundOrderRepository outorderRepository,
- IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository,
+ IDt_WareAreaInfoRepository wareAreaInfoRepository,
+ IDt_InventoryRecordRepository inventoryRecordRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -82,8 +91,9 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
- _outorderRepository = outorderRepository;
- _outorderdetailRepository = outorderdetailRepository;
+ _orderOutDetailsRepository = orderOutDetailsRepository;
+ _wareAreaInfoRepository = wareAreaInfoRepository;
+ _inventoryRecordRepository = inventoryRecordRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -95,42 +105,109 @@
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>();
taskHty.FinishTime = DateTime.Now;
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
-
- //DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
- //stockInfo_Hty.ModifyDate = DateTime.Now;
stock.ModifyDate = DateTime.Now;
stock.LocationCode = task.TargetAddress;
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- //await DeleteStockInfoAsync(stock.Id);
- //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- //await AddStockInfoHtyAsync(stockInfo_Hty);
- _stockInfoRepository.UpdateData(stock);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
- UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)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>());
+ });
+
+ await ERPAllocateOut(stock);
+
+ //璋冩嫧鍑哄簱
+ if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
+ {
+ if (orderDetails.Count > 0)
+ await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList());
+ }
+ //鍏朵粬鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
+ {
+ if (orderDetails.Count > 0)
+ {
+ await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�).ToList());
+ }
+ }
+ //鐢熶骇棰嗘枡鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
+ {
+ if (orderDetails.Count > 0)
+ {
+ content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐢熶骇棰嗘枡鍗�).ToList());
+ }
+ }
+
+ 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(boxingInfo);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ 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);
}
return content;
}
-
-
#endregion 鍑哄簱浠诲姟瀹屾垚
@@ -149,20 +226,27 @@
var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ task.TaskState = (int)TaskRelocationStatusEnum.AGV_RelocationFinish;
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";
- stock.ModifyDate = DateTime.Now;
- stock.LocationCode = task.TargetAddress;
-
+ 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 () =>
{
- //UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
- _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);
});
@@ -189,16 +273,23 @@
WebResponseContent content = new WebResponseContent();
try
{
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
- var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
- var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+ var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- if (stock == null)
+ if (boxinfo == null)
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
- stock.LocationCode = task.TargetAddress;
- stock.StockStatus = (int)StockStateEmun.宸插叆搴�;
+
+ 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);
task.TaskState = (int)TaskInStatusEnum.InFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -206,83 +297,71 @@
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 _stockInfoRepository.UpdateDataAsync(stock);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
+
+ //await _unitOfWorkManage.UseTranAsync(async () =>
+ //{
+ _unitOfWorkManage.BeginTran();
+ await _stockInfoRepository.AddDataNavAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- });
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationRepository.UpdateDataAsync(result2.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);
}
return content;
}
-
+ public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
+ {
+ var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
+ 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,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFullExit = boxingInfo.IsFullExit,
+ 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 浠诲姟瀹屾垚
@@ -372,15 +451,22 @@
WebResponseContent content = new WebResponseContent();
try
{
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
- if (stock == null)
+ 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)
{
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();
+ // 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搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -396,50 +482,49 @@
{
return content.Error($"璧风偣搴撲綅{StartAddress.LocationCode}鎼繍璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
}
- if (taskDto.AreaId != 0)
+ Dt_Task taskNew = new Dt_Task();
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == taskDto.AreaId);
+ if (area == null)
{
- switch (taskDto.AreaId)
- {
- case 1:
- return await InboundStakerArea(taskDto, StartAddress);
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- return await InboundAGVCacheArea(taskDto, StartAddress, await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress));
- 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)
{
- var location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
- if (location != null && location.LocationStatus == (int)LocationEnum.Free && location.EnalbeStatus == 1)
- {
- switch (location.AreaId)
- {
- case 1:
- return await InboundStakerArea(taskDto, StartAddress);
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- return await InboundAGVCacheArea(taskDto, StartAddress, location);
- default:
- return content.Error("璐т綅鍖哄煙鏈壘鍒�");
- }
- }
- else
- {
- return content.OK("鐩爣搴撲綅涓嶅彲鐢�");
- }
+ return content.Error("璇ュ尯鍩熸棤鍙敤搴撲綅锛岃閫夋嫨鍏朵粬鍖哄煙");
}
- else
+
+ switch (taskDto.AreaId)
{
- return content.OK("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ 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 result = UpdateLocationStatus(StartAddress.LocationCode, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ BaseDal.AddData(taskNew);
+ });
+ return content = await SendWCSTask(taskDTO);
}
catch (Exception err)
{
@@ -447,86 +532,47 @@
}
}
- public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress)
+ public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,Dt_AreaInfo area)
{
- WebResponseContent content = new WebResponseContent();
- try
+ var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+
+ return new Dt_Task
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
-
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "SC1",
- TargetAddress = "SC1",
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = station.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = (int)TaskInboundTypeEnum.Inbound,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = "1F",
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- BaseDal.AddData(taskNew);
-
- UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- //UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
-
- //return content.OK();
- return content = await SendWCSTask(taskDTO);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
- }
+ Grade = 1,
+ Roadway = "SC1",
+ TargetAddress = area.AreaName,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = station.stationChildCode,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskInStatusEnum.InNew,
+ TaskType = (int)TaskInboundTypeEnum.Inbound,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = "1F",
+ };
}
- public async Task<WebResponseContent> InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
{
WebResponseContent content = new WebResponseContent();
- try
+
+ Dt_Task taskNew = new Dt_Task();
+ if (StartAddress.Floor != area.Spare1)
{
- if (location == null)
- {
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
- Dt_Task taskNew = new Dt_Task();
- if (StartAddress.Floor != location.Floor)
- {
- taskNew= RequestAcrossFloorTask(StartAddress,location, (int)TaskInboundTypeEnum.Inbound,taskDto.PalletCode);
- }
- else
- {
- taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
- }
-
- var taskDTO = CreateListTaskDTO(taskNew);
- _unitOfWorkManage.BeginTran();
-
- UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
-
- BaseDal.AddData(taskNew);
-
- _unitOfWorkManage.CommitTran();
- //return content.OK();
- return content = await SendWCSTask(taskDTO);
+ taskNew = RequestAcrossFloorTask(StartAddress, area, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
- catch (Exception ex)
+ else
{
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
+ taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(area.AreaID, StartAddress).Result, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
+ return taskNew;
+
}
#endregion 璇锋眰浠诲姟鍏ュ簱
@@ -547,29 +593,12 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish || taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
- {
- var taskHty = CreateHistoricalTask(task);
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
- var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- if (asb && asbHty)
- content.OK();
- else
- throw new Exception();
- });
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
content.OK();
- }
else
- {
- task.TaskState = taskState;
- var asb = await BaseDal.UpdateDataAsync(task);
- if (asb)
- content.OK();
- else
- content.Error();
- }
+ content.Error();
}
catch (Exception ex)
{
@@ -578,66 +607,67 @@
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 璇锋眰鍑哄簱
- public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱鑷崇紦瀛樺尯鍩�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark,int doubleTray)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
if (stcok == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
}
+
+ if (stcok.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+
var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
if (location.AreaId == 2)
{
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- return await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode ,TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ 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, StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _inventoryRecordRepository.AddDataAsync(records);
+ await _stockInfoRepository.UpdateDataAsync(stcok);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ });
+ return content = await SendWCSTask(taskDto);
}
catch (Exception ex)
{
@@ -647,121 +677,324 @@
/// <summary>
+ /// 鍏朵粬鍑哄簱
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
+
+ public async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ 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 = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "",
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鎵嬪姩璋冩嫧
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> HandAllocateOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ 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 =>
+ {
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ 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()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = wareinfo.WareAreaName,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = wareinfo.WareAreaCode ,
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task, StatusChangeTypeEnum StatusChangeTypeEnum)
+ {
+ List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ var result = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum);
+ locationStatusChangeRecords.AddRange(result.Item1);
+ locations.AddRange(result.Item2);
+
+ return (locationStatusChangeRecords,locations);
+ }
+
+ /// <summary>
/// 璇锋眰鍑哄簱浠诲姟
/// </summary>
/// <param name="taskDto"></param>
/// <returns></returns>
- public async Task<WebResponseContent> RequestOutboundTaskAsync(RequestTaskDto taskDto)
+ public async Task<Dt_Task> RequestOutboundTaskAsync(RequestTaskDto taskDto)
{
- WebResponseContent content = new WebResponseContent();
- try
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
+ if (stcok == null)
{
- DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
- if (stcok == null)
- {
- return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
- }
-
- var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
- if (StartAddress == null)
- {
- return content.Error("璧风偣搴撲綅鏈壘鍒�");
- }
- if (!LocationIsOutBound(StartAddress))
- {
- return content.Error($"璧风偣搴撲綅{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);
-
- if (location != null && location.LocationStatus != (int)LocationEnum.Free && location.EnalbeStatus == 1)
- {
- return content.OK("鐩爣搴撲綅涓嶅彲鐢�");
- }
- }
- else
- {
- return content.OK("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
- }
-
- switch (StartAddress.AreaId)
- {
- case 1:
- return await OutboundStakerArea(taskDto, StartAddress, location);
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- return await OutboundAGVCacheArea(taskDto, StartAddress, location);
- default:
- return content.Error("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
- }
+ throw new Exception("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
}
- catch (Exception ex)
+
+ var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+ if (StartAddress == null)
{
- return content.Error(ex.Message);
+ throw new Exception("璧风偣搴撲綅鏈壘鍒�");
+ }
+ if (!LocationIsOutBound(StartAddress))
+ {
+ throw new Exception($"璧风偣搴撲綅{StartAddress.LocationCode}鍑哄簱璺緞琚崰鐢紝璇风◢鍚庨噸璇�");
+ }
+
+ var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
+
+ 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($"鍑哄簱缂撳瓨鍖烘棤鍙敤搴撲綅锛岃娓呯悊搴撲綅鍚庡啀璇�");
+ }
+
+ switch (StartAddress.AreaId)
+ {
+ case 1:
+ return OutboundStakerArea(taskDto, StartAddress, area);
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return OutboundAGVCacheArea(taskDto, StartAddress, area);
+ default:
+ throw new Exception("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
}
}
- public async Task<WebResponseContent> 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");
+
+ return new Dt_Task
+ {
+ Grade = Convert.ToInt32(StartAddress.Remark),
+ Roadway = "SC1",
+ TargetAddress = area.AreaName,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = taskDto.MaterielCode,
+ NextAddress = station.stationChildCode,
+ OrderNo = taskDto.OrderNo,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = taskDto.TaskType,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = "1F",
+ };
+ }
+
+ public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
+ {
+ Dt_Task taskNew = new Dt_Task();
+ if (StartAddress.Floor != area.Spare1)
+ {
+ taskNew = RequestAcrossFloorTask(StartAddress, area, taskDto.TaskType, taskDto);
+ }
+ else
+ {
+ 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 station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+ var startLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == SourceAddress);
+ var endLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == TargetAddress);
- if (location == null)
+ if (!startLocation.IsNotEmptyOrNull() || !endLocation.IsNotEmptyOrNull())
{
- return content.Error("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
+ 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("绉诲簱璧风偣搴撲綅涓庣粓鐐瑰簱浣嶄笉鍦ㄥ悓涓�妤煎眰");
}
- if (location.AreaId == 5 || location.AreaId == 6)
+ var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == startLocation.LocationCode);
+ var taskNew = new Dt_Task
{
- return content.Error("褰撳墠鍖哄煙涓嶅彲鍑哄簱锛岃鑱旂郴绠＄悊鍛�");
- }
- Dt_Task taskNew = new Dt_Task
- {
- Grade = Convert.ToInt32(StartAddress.Remark),
- Roadway = "SC1",
- TargetAddress = location.LocationCode,
+ Grade = startLocation.Floor == "1F" ? 10 : 1,
+ Roadway = endLocation.RoadwayNo,
+ TargetAddress = endLocation.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = station.stationChildCode,
+ NextAddress = endLocation.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = taskDto.TaskType,
+ 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 = "1F",
+ Floor = startLocation.Floor,
};
- var taskDTO = CreateListTaskDTO(taskNew);
- UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- BaseDal.AddData(taskNew);
- //return content.OK();
- return content = await SendWCSTask(taskDTO);
+ 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)
{
@@ -769,40 +1002,8 @@
}
}
- public async Task<WebResponseContent> OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (location == null)
- {
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
- Dt_Task taskNew = new Dt_Task();
- if (StartAddress.Floor != location.Floor)
- {
- taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
- }
- else
- {
- taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
- }
- var taskDTO = CreateListTaskDTO(taskNew);
-
- UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
-
- BaseDal.AddData(taskNew);
- //return content.OK();
- return content = await SendWCSTask(taskDTO);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
- #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
+ #endregion
#region 璇锋眰璺ㄦゼ灞�2浠诲姟
/// <summary>
@@ -827,14 +1028,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,
@@ -853,9 +1055,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);
@@ -871,73 +1074,63 @@
#endregion
#region 璇锋眰璺ㄦゼ灞備换鍔�
- public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress,DtLocationInfo EndAddress,int TaskType,string palletCode)
+ public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, Dt_AreaInfo area, int TaskType, RequestTaskDto taskDto)
{
WebResponseContent content = new WebResponseContent();
- try
+
+ var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == StartAddress.Floor);
+ return new Dt_Task
{
- var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == StartAddress.Floor);
- return new Dt_Task
- {
- Grade = StartAddress.Column,
- Roadway = "AGV",
- TargetAddress = EndAddress.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = next.stationChildCode,
- OrderNo = null,
- PalletCode = palletCode,
- SourceAddress = StartAddress.LocationCode,
- CurrentAddress = StartAddress.LocationCode,
- TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
- TaskType = TaskType,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- Remark = StartAddress.AreaId.ToString(),
- AGVTaskNum = GenerateUniqueId(),
- Floor = StartAddress.Floor,
- };
- }
- catch (Exception ex)
- {
- return null;
- }
+ Grade = StartAddress.Column,
+ Roadway = "AGV",
+ TargetAddress = area.AreaName,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = taskDto.MaterielCode,
+ NextAddress = next.stationChildCode,
+ OrderNo = taskDto.OrderNo,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = StartAddress.LocationCode,
+ CurrentAddress = StartAddress.LocationCode,
+ TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
+ TaskType = TaskType,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ Remark = StartAddress.AreaId.ToString(),
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = StartAddress.Floor,
+ DoubleTray = taskDto.DoubleTray,
+ };
+
}
#endregion
#region 璇锋眰AGV鎼繍浠诲姟
- public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
+ public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
{
WebResponseContent content = new WebResponseContent();
- try
+
+ return new Dt_Task
{
- return new Dt_Task
- {
- Grade = StartAddress.Column,
- Roadway = "AGV",
- TargetAddress = EndAddress.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = EndAddress.LocationCode,
- OrderNo = null,
- PalletCode = palletCode,
- SourceAddress = StartAddress.LocationCode,
- CurrentAddress = StartAddress.LocationCode,
- TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = TaskType,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- Remark = StartAddress.AreaId.ToString(),
- AGVTaskNum = GenerateUniqueId(),
- Floor = StartAddress.Floor,
- };
- }
- catch (Exception ex)
- {
- return null;
- }
+ Grade = StartAddress.Column,
+ Roadway = "AGV",
+ TargetAddress = EndAddress.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = taskDto.MaterielCode,
+ NextAddress = EndAddress.LocationCode,
+ OrderNo = taskDto.OrderNo,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = StartAddress.LocationCode,
+ CurrentAddress = StartAddress.LocationCode,
+ TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
+ TaskType = TaskType,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ Remark = StartAddress.AreaId.ToString(),
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = StartAddress.Floor,
+ };
}
#endregion
@@ -976,16 +1169,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
@@ -997,7 +1194,7 @@
MaterialNo = "",
NextAddress = TargetAddress.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode + "001",
+ 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,
@@ -1010,8 +1207,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();
@@ -1045,12 +1240,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:
@@ -1067,14 +1263,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);
@@ -1082,41 +1278,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)
@@ -1125,6 +1331,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
@@ -1181,6 +1464,7 @@
}
return wcsBasez + address;
}
+
public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -1207,12 +1491,119 @@
return wcsBasez + address;
}
- public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
+ /// <summary>
+ /// 鐢熶骇棰嗘枡
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
+ MaterialRequisition materialRequisition = new MaterialRequisition
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "LL20",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+ issueList = orderOutDetails.Select(item => new issueList
+ {
+ PickListID = item.ERPOrderId,
+ //瀛樺偍鍦扮偣
+ WhCode = "205",
+ //棰嗘枡鏁伴噺
+ IssueQty = item.OutboundQuantity,
+ }).ToList()
+
+ };
+ var ERPProduction = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MaterialRequisition);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+
+ var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (respone.d.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.d.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璋冩嫧
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ ///
+ public async Task ERPAllocate(DtBoxingInfo boxing)
+ {
+ try
+ {
+ if (boxing == null)
+ {
+ throw new Exception("鏈壘鍒扮粍鐩樹俊鎭�");
+ }
+ Allocate allocate = new Allocate
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ transferInList = boxing.BoxingInfoDetails.Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = "107",
+ //璋冨叆鏁伴噺
+ TransInQty = item.Quantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = item.WareHouseId,
+ }).ToList()
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception(respone.d.ResultMsg);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
+ public async Task ERPAllocateOut(DtStockInfo stock)
+ {
+ try
+ {
+ if (stock == null)
+ {
+ throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1228,10 +1619,216 @@
transferInList = stock.StockInfoDetails.Select(item => new transferInList
{
+ //鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
- TransInWHCode = item.Warehouse,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = "205",
+ //璋冨叆鏁伴噺
TransInQty = item.Quantity,
- TransOutWHCode = "001",
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = "107",
+ }).ToList()
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception(respone.d.ResultMsg);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
+
+ public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ try
+ {
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
+ List<transferInList> transferInList=new List<transferInList>();
+ foreach (var item in orderOutDetails)
+ {
+ if (item.AllocateWarehouseId == "205")
+ {
+ continue;
+ }
+ transferInList.Add(new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = item.AllocateWarehouseId,
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = "205",
+ });
+ }
+ if (transferInList.Count <= 0)
+ {
+ return;
+ }
+ Allocate allocate = new Allocate
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+ transferInList = transferInList,
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception($"ERP璋冩嫧鍑哄簱{respone.d.ResultMsg}");
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏉傚彂
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ try
+ {
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
+ MixedSend send = new MixedSend
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "MiscShip001",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ miscShipList = orderOutDetails.Select(item => new miscShipList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //瀛樺偍鍦扮偣缂栧彿
+ WhCode = "205",
+ //鏉傚彂鏁伴噺
+ Qty = item.OutboundQuantity,
+
+ BenefitDeptCode = "0505",
+ }).ToList()
+ };
+ var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception($"ERP鍏朵粬鍑哄簱{respone.d.ResultMsg}");
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏉傛敹
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPMixedReceive(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ MixedReceive allocate = new MixedReceive
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ miscRcvList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscRcvList
+ {
+ ItemCode = item.MaterielCode,
+ WhCode = item.Warehouse,
+ Qty = item.OutboundQuantity,
+ CostPrice = 0,
+ }).ToList()
+ };
+ return content.OK(data: allocate);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 閫�鏂�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPreturnMaterialList(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ ReturnMaterials allocate = new ReturnMaterials
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ returnMaterialList = stock.StockInfoDetails.Select(item => new returnMaterialList
+ {
+ PickListID = item.MaterielCode,
+ WhCode = item.Warehouse,
+ RecedeQty = item.OutboundQuantity,
+ RecedeReason = 1,
}).ToList()
};
return content.OK(data: allocate);
@@ -1242,12 +1839,11 @@
}
}
-
#endregion
#region 鍐呴儴璋冪敤鏂规硶
- public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
{
List<DtLocationInfo> locations = GetGroupLocations(location);
@@ -1305,26 +1901,112 @@
}
}
}
- List<LocationChangeRecordDto> changeRecordDto = new List<LocationChangeRecordDto>();
+ List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
foreach (var item in Beforelocation)
{
var loc = locations.Where(x => x.LocationCode == item.LocationCode).FirstOrDefault();
if (loc != null)
{
- changeRecordDto.Add(new LocationChangeRecordDto()
+ DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
{
+ ChangeType = StatusChangeType,
+ LocationCode = item.LocationCode,
+ LocationId = loc.Id,
+ Creater = "System",
+ TaskNum = taskNum,
AfterStatus = loc.LocationStatus,
BeforeStatus = item.LocationStatus,
- TaskNum = taskNum,
- LocationId = loc.Id,
- LocationCode = loc.LocationCode,
- ChangeType = StatusChangeType,
- });
+ };
+
+ changeRecordDto.Add(dtLocationStatusChangeRecord);
}
}
- _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+ return (changeRecordDto,locations);
+ }
- _locationRepository.UpdateData(locations);
+ public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) UpdateLocationStatus(string locationCode, LocationEnum locationStatus, int taskNum, int StatusChangeType)
+ {
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == locationCode);
+
+ List<DtLocationInfo> locations = GetGroupLocations(location);
+
+ List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
+ {
+ Id = x.Id,
+ LocationCode = x.LocationCode,
+ LocationStatus = x.LocationStatus
+ }).ToList();
+
+ foreach (var item in locations)
+ {
+ if (locationStatus == LocationEnum.Lock)
+ {
+ if (item.LocationCode == location.LocationCode)
+ {
+ item.LocationStatus = (int)LocationEnum.Lock;
+ }
+ }
+ else if (locationStatus == LocationEnum.InStock)
+ {
+ if (item.LocationCode == location.LocationCode)
+ {
+ item.LocationStatus = (int)LocationEnum.InStock;
+ }
+ }
+ else if (locationStatus == LocationEnum.InStockDisable)
+ {
+ if (item.LocationStatus == (int)LocationEnum.InStock)
+ {
+ item.LocationStatus = (int)LocationEnum.InStockDisable;
+ }
+ }
+ else if (locationStatus == LocationEnum.Free)
+ {
+ item.LocationStatus = (int)LocationEnum.Free;
+ }
+ }
+ List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
+ foreach (var item in Beforelocation)
+ {
+ var loc = locations.Where(x => x.LocationCode == item.LocationCode).FirstOrDefault();
+ if (loc != null)
+ {
+ DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
+ {
+ ChangeType = StatusChangeType,
+ LocationCode = item.LocationCode,
+ LocationId = loc.Id,
+ Creater = "System",
+ TaskNum = taskNum,
+ AfterStatus = loc.LocationStatus,
+ BeforeStatus = item.LocationStatus,
+ };
+
+ changeRecordDto.Add(dtLocationStatusChangeRecord);
+ }
+ }
+ return (changeRecordDto, locations);
+ }
+
+ 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)
@@ -1342,7 +2024,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)
@@ -1378,7 +2060,9 @@
TaskState = task.TaskState,
Id = 0,
TaskType = task.TaskType,
+ Floor =task.Floor,
AGVTaskNum = task.AGVTaskNum,
+ DoubleTray = task.DoubleTray,
} };
}
@@ -1396,8 +2080,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)
@@ -1561,7 +2272,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;
@@ -1580,7 +2290,7 @@
TaskNum = task.TaskNum.Value,
LocationId = StartAddress.Id,
LocationCode = StartAddress.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
},
new LocationChangeRecordDto()
{
@@ -1589,7 +2299,7 @@
TaskNum = task.TaskNum.Value,
LocationId = EndAddress.Id,
LocationCode = EndAddress.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
},
};
@@ -1600,80 +2310,106 @@
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>
/// 鑾峰彇璐т綅鍙�
/// </summary>
/// <returns></returns>
public async Task<DtLocationInfo> GetEmptyLocation(string roadWay)
{
- try
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == "SC1" && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
+ if (locations.Count < 2)
{
- List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == "SC1" && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
- if (locations.Count < 2)
- {
- return null;
- }
-
- List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
- var locationInside = locations.Where(x => x.Row == 3).ToList();
-
- if (locations.Where(x => x.Row == 2).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
- {
- return locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
- }
- else if (locationInside.Count > 0)
- {
- foreach (var item in locationInside)
- {
- var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Layer == item.Layer && x.Column == item.Column);
- if (locationLateral.LocationStatus == (int)LocationEnum.Free && locationLateral.EnalbeStatus == 1)
- {
- locationInfos.Add(item);
- }
- }
-
- return locationInfos.Distinct().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
- }
- else if (locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
- {
- return locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
- }
- else
- {
- return null;
- }
+ return null;
}
- catch (Exception ex)
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ var locationInside = locations.Where(x => x.Row == 3).ToList();
+
+ if (locations.Where(x => x.Row == 2).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
{
- throw new Exception(ex.Message);
+ return locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ }
+ else if (locationInside.Count > 0)
+ {
+ foreach (var item in locationInside)
+ {
+ var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Layer == item.Layer && x.Column == item.Column);
+ if (locationLateral.LocationStatus == (int)LocationEnum.Free && locationLateral.EnalbeStatus == 1)
+ {
+ locationInfos.Add(item);
+ }
+ }
+
+ return locationInfos.Distinct().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ }
+ else if (locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
+ {
+ return locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ }
+ else
+ {
+ return null;
}
}
public async Task<DtLocationInfo> GetAGVEmptyCacheLocation(int AreaId, DtLocationInfo loc)
{
- try
+ if (loc == null)
{
- if(loc==null)
- {
- return null;
- }
- switch (AreaId)
- {
- case 2:
- return await FromShallowToDeep(AreaId, loc);
- case 3:
- return await AGVLIKU(AreaId);
- case 5:
- case 6:
- return await FromDeepToShallow(AreaId, loc);
- default:
- return null;
- }
-
+ return null;
}
- catch (Exception ex)
+ switch (AreaId)
{
- throw new Exception(ex.Message);
+ case 2:
+ case 7:
+ return await FromShallowToDeep(AreaId, loc);
+ case 3:
+ return await AGVLIKU(AreaId);
+ case 5:
+ case 6:
+ return await FromDeepToShallow(AreaId, loc);
+ default:
+ return null;
}
}
@@ -1684,45 +2420,43 @@
/// <returns></returns>
public async Task<DtLocationInfo> FromDeepToShallow(int AreaId, DtLocationInfo loc)
{
- try
- {
- List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
- if (AreaId == loc.AreaId)
+ if (AreaId == loc.AreaId)
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
+ }
+ if (locations.Count == 0)
+ {
+ return null;
+ }
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ 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)
{
- locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
+ locationInfos.Add(item);
+ continue;
}
- else
+ bool Isavailable = true;
+ foreach (var lateral in locationLateral)
{
- locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
- }
- if (locations.Count == 0)
- {
- return null;
- }
- List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
- foreach (var item in locations)
- {
- var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
- bool Isavailable = true;
- foreach (var lateral in locationLateral)
+ if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
{
- if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
- {
- Isavailable = false;
- continue;
- }
+ Isavailable = false;
+ continue;
}
- if(Isavailable)
- locationInfos.Add(item);
}
+ if (Isavailable)
+ locationInfos.Add(item);
+ }
- return locationInfos.Distinct().OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+ return locationInfos.Distinct().OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
}
/// <summary>
@@ -1732,118 +2466,101 @@
/// <returns></returns>
public async Task<DtLocationInfo> FromShallowToDeep(int AreaId, DtLocationInfo loc)
{
- try
+ List<DtLocationInfo> locations = new List<DtLocationInfo>();
+
+ if (AreaId == loc.AreaId)
{
- List<DtLocationInfo> locations = new List<DtLocationInfo>();
+ locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
+ }
+ else
+ {
+ locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
+ }
- if (AreaId == loc.AreaId)
+ if (locations.Count == 0)
+ {
+ return null;
+ }
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ 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)
{
- locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
+ locationInfos.Add(item);
+ continue;
}
- else
+ bool Isavailable = true;
+ foreach (var lateral in locationLateral)
{
- locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
- }
-
- if (locations.Count == 0)
- {
- return null;
- }
- List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
- 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)
+ if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
{
- locationInfos.Add(item);
+ Isavailable = false;
continue;
}
- foreach (var Lateral in locationLateral)
- {
- if (locationInfos.Contains(Lateral))
- continue;
- if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
- {
- locationInfos.Add(item);
- }
- }
}
+ if (Isavailable)
+ locationInfos.Add(item);
+ }
+ return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
}
public async Task<DtLocationInfo> AGVLIKU(int AreaId)
{
WebResponseContent content = new WebResponseContent();
- try
- {
- List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
- var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
- return location;
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
+ var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ return location;
+
}
public bool LocationIsOutBound(DtLocationInfo location)
{
- try
+ if (location.AreaId == 1)
{
- int sum = 0;
- if (location.AreaId == 1)
+ if (location.Depth == 2)
{
- if (location.Depth == 2)
- {
- var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == location.Column && x.Layer == location.Layer);
+ var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == location.Column && x.Layer == location.Layer);
- if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
- {
- return false;
- }
+ if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
+ {
+ return false;
}
}
-
- else if (location.AreaId == 2)
- {
- var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);
-
- foreach (var Lateral in locationLateral)
- {
- if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
- {
- return false;
- }
- }
- }
-
- else if (location.AreaId == 5 || location.AreaId == 6)
- {
- var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column < location.Column && x.Remark == location.Remark);
-
- foreach (var lateral in locationLateral)
- {
- if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
- {
- return false;
- }
- }
- }
-
- return true;
}
- catch (Exception)
+
+ else if (location.AreaId == 2 || location.AreaId == 7)
{
- return false;
+ var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);
+
+ foreach (var Lateral in locationLateral)
+ {
+ if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
+ {
+ return false;
+ }
+ }
}
+
+ else if (location.AreaId == 5 || location.AreaId == 6)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column < location.Column && x.Remark == location.Remark);
+
+ foreach (var lateral in locationLateral)
+ {
+ if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
+ {
+ return false;
+ }
+ }
+ }
+
+ return true;
+
}
--
Gitblit v1.9.3