From 4dfe8ece141f05a163cf7d290b6fe4c520d89909 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 31 十月 2025 17:28:33 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1758 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1,201 insertions(+), 557 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 53e5909..1ea3cb1 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,20 @@
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;
+using System.Security.Policy;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Cache;
@@ -19,11 +26,16 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
+using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
+using WIDESEA_IOrderRepository;
using WIDESEA_IServices;
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;
@@ -45,6 +57,7 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -58,7 +71,8 @@
IDt_AreaInfoRepository areaInfoRepository,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -72,6 +86,7 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _orderOutDetailsRepository = orderOutDetailsRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -83,25 +98,77 @@
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);
+
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";
+ 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);
+ 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>());
+ });
+ //鐩樼偣鍑哄簱
+
+ if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
+ {
+ if (orderDetails.Count > 0)
+ await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐩樼偣鍑哄簱鍗� || 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());
+ await ERPAllocate(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());
+ await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList());
+ }
+ }
await _unitOfWorkManage.UseTranAsync(async () =>
{
+ await DeleteStockInfoAsync(stock.Id);
+ 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);
});
+ content.OK("鍑哄簱瀹屾垚");
+
}
catch (Exception ex)
{
+ task.ErrorMessage = ex.Message;
+ await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
}
return content;
}
-
-
#endregion 鍑哄簱浠诲姟瀹屾垚
@@ -117,17 +184,27 @@
WebResponseContent content = new WebResponseContent();
try
{
- // 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
- (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
- var taskHty = CreateHistoricalTask(task);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
+ var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
+ var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- // 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = false;
- if (isResult)
- content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
- else
- content.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
+ 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;
+ var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ _stockInfoRepository.UpdateData(stock);
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
+ content.OK("绉诲簱瀹屾垚");
}
catch (Exception err)
{
@@ -150,18 +227,16 @@
WebResponseContent content = new WebResponseContent();
try
{
- var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ 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 (boxing == null)
+ if (boxinfo == null)
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
- DtStockInfo stock = CreatePalletStock(task, boxing);
- DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
- boxingInfo_Hty.ModifyDate = DateTime.Now;
+ var stock = CreateStock(boxinfo, task);
task.TaskState = (int)TaskInStatusEnum.InFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -169,26 +244,47 @@
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);
+
+ await ERPAllocate(stock);
+
await _unitOfWorkManage.UseTranAsync(async () =>
{
await _stockInfoRepository.AddDataNavAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
- .Include(x => x.BoxingInfoDetails)
- .ExecuteCommandAsync();
- await AddBoxingHtyAsync(boxingInfo_Hty);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
});
content.OK("鍏ュ簱瀹屾垚");
}
catch (Exception ex)
{
+ 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.宸插叆搴�; });
+ return new DtStockInfo()
+ {
+ PalletCode = task.PalletCode,
+ LocationCode = task.TargetAddress,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ IsFullExit = boxingInfo.IsFullExit,
+ StockInfoDetails = boxDetail,
+ StockStatus = (int)StockStateEmun.宸插叆搴�
+ };
+ }
#endregion 鍏ュ簱浠诲姟瀹屾垚
#region AGV鎼繍浠诲姟瀹屾垚
@@ -274,8 +370,7 @@
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
- //var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- DtStockInfo stock = null;
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
@@ -297,6 +392,40 @@
#endregion 浠诲姟瀹屾垚
+ #region 鍙栨秷浠诲姟
+ public WebResponseContent TaskCancel(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+ _unitOfWorkManage.BeginTran();
+ MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
+ if (methodInfo != null)
+ {
+ WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
+ if (responseContent != null)
+ {
+ if (responseContent != null)
+ {
+
+ }
+ }
+ }
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
+
#region 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestInboundTaskAsync(RequestTaskDto taskDto)
@@ -304,7 +433,8 @@
WebResponseContent content = new WebResponseContent();
try
{
- var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode);
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+
if (boxingInfo == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
@@ -328,37 +458,45 @@
{
return content.Error($"璧风偣搴撲綅{StartAddress.LocationCode}鎼繍璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
}
+ Dt_Task taskNew = new Dt_Task();
+ DtLocationInfo Endlocation= new DtLocationInfo();
if (taskDto.AreaId != 0)
{
switch (taskDto.AreaId)
{
case 1:
- return await InboundStakerArea(taskDto, StartAddress, await GetEmptyLocation("SC1"));
+ Endlocation = await GetEmptyLocation("SC1");
+ taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
+ break;
case 2:
case 3:
case 4:
case 5:
case 6:
- return await InboundAGVCacheArea(taskDto, StartAddress, await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress));
+ Endlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
+ taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
+ break;
default:
return content.Error("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
}
}
else if (taskDto.TargetAddress != null)
{
- var location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
- if (location != null && location.LocationStatus == (int)LocationEnum.Free && location.EnalbeStatus == 1)
+ Endlocation = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
+ if (Endlocation != null && Endlocation.LocationStatus == (int)LocationEnum.Free && Endlocation.EnalbeStatus == 1)
{
- switch (taskDto.AreaId)
+ switch (Endlocation.AreaId)
{
case 1:
- return await InboundStakerArea(taskDto, location, StartAddress);
+ taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
+ break;
case 2:
case 3:
case 4:
case 5:
case 6:
- return await InboundAGVCacheArea(taskDto, location, StartAddress);
+ taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
+ break;
default:
return content.Error("璐т綅鍖哄煙鏈壘鍒�");
}
@@ -370,8 +508,23 @@
}
else
{
- return content.OK("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ 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);
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
+ BaseDal.AddData(taskNew);
+ });
+ return content = await SendWCSTask(taskDTO);
+ //return content.OK("鎴愬姛");
}
catch (Exception err)
{
@@ -379,92 +532,54 @@
}
}
- public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,DtLocationInfo EndLocation)
{
- WebResponseContent content = new WebResponseContent();
- try
+ var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+ if (EndLocation == null)
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
-
- if (location == null)
- {
- return content.Error("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "SC1",
- TargetAddress = location.LocationCode,
- 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);
+ throw new Exception("鏃犳硶鑾峰彇璐т綅淇℃伅");
}
- catch (Exception ex)
+ return new Dt_Task
{
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
- }
+ Grade = 1,
+ Roadway = "SC1",
+ TargetAddress = EndLocation.LocationCode,
+ 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, DtLocationInfo location)
{
WebResponseContent content = new WebResponseContent();
- try
+
+ if (location == null)
{
- 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);
+ throw new Exception("鏃犳硶鑾峰彇璐т綅淇℃伅");
}
- catch (Exception ex)
+ Dt_Task taskNew = new Dt_Task();
+ if (StartAddress.Floor != location.Floor)
{
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
+ taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
}
+ else
+ {
+ taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
+ }
+ return taskNew;
+
}
#endregion 璇锋眰浠诲姟鍏ュ簱
@@ -485,29 +600,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)
{
@@ -560,162 +658,396 @@
#endregion
#region 璇锋眰鍑哄簱
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱鑷崇紦瀛樺尯鍩�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ 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("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ stcok.StockInfoDetails.ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stcok.PalletCode,
+ OrderType = (int)OrderTypeEmun.鐩樼偣鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "205",
+ OutboundQuantity = x.Quantity,
+ });
+ });
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ BaseDal.AddData(taskNew);
+ _stockInfoRepository.UpdateData(stcok);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ _orderOutDetailsRepository.AddData(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ 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 =>
+ {
+ 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,
+ });
+ });
+ details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "205",
+ OutboundQuantity = x.Quantity - x.OutboundQuantity,
+ });
+ });
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)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();
+ }
+ }
+
+ /// <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.OutOther });
+
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ {
+ var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
+ if (areaName == null)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
+ }
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = x.Remark,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = areaName.AreaName,
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+ details.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "205",
+ OutboundQuantity = x.Quantity - x.OutboundQuantity,
+ });
+ });
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)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();
+ }
+ }
+
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task,int StatusChangeTypeEnum)
+ {
+ 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);
+
+ 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>
/// 璇锋眰鍑哄簱浠诲姟
/// </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("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
- //}
+ throw new Exception("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
+ }
- var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
- if (StartAddress == null)
+ var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+ if (StartAddress == null)
+ {
+ throw new Exception("璧风偣搴撲綅鏈壘鍒�");
+ }
+ if (!LocationIsOutBound(StartAddress))
+ {
+ throw new Exception($"璧风偣搴撲綅{StartAddress.LocationCode}鍑哄簱璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
+ }
+ DtLocationInfo location = null;
+ if (taskDto.AreaId != 0)
+ {
+ if (taskDto.AreaId == 1)
{
- 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("鐩爣搴撲綅涓嶅彲鐢�");
- }
+ location = await GetEmptyLocation("SC1");
}
else
{
- return content.OK("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ location = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
}
- switch (StartAddress.AreaId)
+ }
+ else if (taskDto.TargetAddress != null)
+ {
+ location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
+
+ if (location != null && location.LocationStatus != (int)LocationEnum.Free && location.EnalbeStatus == 1)
{
- 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)
+ else
{
- return content.Error(ex.Message);
+ throw new Exception("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ }
+ switch (StartAddress.AreaId)
+ {
+ case 1:
+ return OutboundStakerArea(taskDto, StartAddress, location);
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ return OutboundAGVCacheArea(taskDto, StartAddress, location);
+ default:
+ throw new Exception("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
}
}
- public async Task<WebResponseContent> OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+
+ public Dt_Task OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
{
- WebResponseContent content = new WebResponseContent();
- try
+ var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+
+ if (location == null)
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
-
- if (location == null)
- {
- return content.Error("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
-
- if (location.AreaId == 5 || location.AreaId == 6)
- {
- return content.Error("褰撳墠鍖哄煙涓嶅彲鍑哄簱锛岃鑱旂郴绠＄悊鍛�");
- }
- Dt_Task taskNew = new Dt_Task
- {
- Grade = Convert.ToInt32(StartAddress.Remark),
- Roadway = "SC1",
- TargetAddress = location.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = station.stationChildCode,
- OrderNo = null,
- 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",
- };
- 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);
+ throw new Exception("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
}
- catch (Exception ex)
+
+ if (location.AreaId == 5 || location.AreaId == 6)
{
- return content.Error(ex.Message);
+ throw new Exception("褰撳墠鍖哄煙涓嶅彲鍑哄簱锛岃鑱旂郴绠＄悊鍛�");
}
+ return new Dt_Task
+ {
+ Grade = Convert.ToInt32(StartAddress.Remark),
+ Roadway = "SC1",
+ TargetAddress = location.LocationCode,
+ 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 async Task<WebResponseContent> OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
+ public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
{
- WebResponseContent content = new WebResponseContent();
- try
+ if (location == null)
{
- 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);
+ throw new Exception("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
}
- catch (Exception ex)
+ Dt_Task taskNew = new Dt_Task();
+ if (StartAddress.Floor != location.Floor)
{
- return content.Error(ex.Message);
+ taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto);
}
+ else
+ {
+ taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto);
+ }
+ return taskNew;
+
}
#endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -763,16 +1095,17 @@
Floor = stationManager.stationFloor,
};
var taskDTO = CreateTaskDTO(taskNew);
-
+ task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
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 () =>
{
- BaseDal.AddData(taskNew);
+
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
+ BaseDal.AddData(taskNew);
});
return content.OK(data: taskDTO);
}
@@ -785,73 +1118,62 @@
#endregion
#region 璇锋眰璺ㄦゼ灞備换鍔�
- public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress,DtLocationInfo EndAddress,int TaskType,string palletCode)
+ public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, 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 = EndAddress.LocationCode,
+ 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,
+ };
+
}
#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
@@ -911,7 +1233,7 @@
MaterialNo = "",
NextAddress = TargetAddress.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode + "001",
+ PalletCode = stock.PalletCode,
SourceAddress = locationLateral.LocationCode,
CurrentAddress = locationLateral.LocationCode,
TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1059,11 +1381,32 @@
}
#endregion
+ #region 鑾峰彇浠诲姟淇℃伅
+ public WebResponseContent GetTaskInfo()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Expression<Func<Dt_Task, bool>> expression = x => true;
+ if (!App.User.IsSuperAdmin)
+ {
+ expression = x => x.Creater == App.User.UserName;
+ }
+ var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(100).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode = x.PalletCode, TaskType = x.TaskType, SourceAddress = x.SourceAddress, TargetAddress = x.TargetAddress }).ToList();
+ content = WebResponseContent.Instance.OK(data: task);
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+ #endregion
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
- private string GetAGVIPAddress(string baseIp, string name)
+ private string GetWCSIPAddress(string baseIp, string name)
{
var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
@@ -1077,7 +1420,7 @@
public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
{
WebResponseContent content = new WebResponseContent();
- var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
+ var AgvSendTaskAddrss = GetWCSIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, taskDTO.ToJsonString());
@@ -1087,13 +1430,322 @@
}
#endregion
+ #region ERP鎺ュ彛璋冪敤
+ public string GetERPIPAddress(string baseIp, string name)
+ {
+ var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
+ var address = configz.Where(x => x.ConfigKey == name).FirstOrDefault()?.ConfigValue;
+ if (wcsBasez == null || address == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ return wcsBasez + address;
+ }
+
+ /// <summary>
+ /// 鐢熶骇棰嗘枡
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ MaterialRequisition materialRequisition = new MaterialRequisition
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+ issueList = orderOutDetails.Select(item => new issueList
+ {
+ PickListID = item.MaterielID,
+ //瀛樺偍鍦扮偣
+ WhCode = item.WareHouseId,
+ //棰嗘枡鏁伴噺
+ 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(DtStockInfo stock)
+ {
+ try
+ {
+ if (stock == 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 = stock.StockInfoDetails.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 ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ try
+ {
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
+ List<transferInList> transferInList=new List<transferInList>();
+ orderOutDetails.ForEach(x =>
+ {
+ transferInList.Add(new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = x.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = x.AllocateWarehouseId,
+ //璋冨叆鏁伴噺
+ TransInQty = x.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = x.WareHouseId,
+ });
+ });
+ 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 = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ miscShipList = orderOutDetails.Select(item => new miscShipList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //瀛樺偍鍦扮偣缂栧彿
+ WhCode = item.WareHouseId,
+ //鏉傚彂鏁伴噺
+ 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);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #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);
- List<DtLocationInfo> Beforelocation = locations;
+ List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
+ {
+ Id = x.Id,
+ LocationCode = x.LocationCode,
+ LocationStatus = x.LocationStatus
+ }).ToList();
foreach (var item in locations)
{
@@ -1142,26 +1794,116 @@
}
}
}
- 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);
+ //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- _locationRepository.UpdateData(locations);
+ //_locationRepository.UpdateData(locations);
+ return (changeRecordDto,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 (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)
+ {
+ if (item.LocationStatus == (int)LocationEnum.InStock)
+ {
+ 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;
+ }
+ }
+ }
+ 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);
+ }
+ }
+ //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+
+ //_locationRepository.UpdateData(locations);
+ return (changeRecordDto, locations);
}
public List<DtLocationInfo> GetGroupLocations(DtLocationInfo location)
@@ -1237,15 +1979,6 @@
};
}
- private bool IsAcrossFloor(DtLocationInfo Sourcelocation,DtLocationInfo Targetlocation)
- {
- return Sourcelocation.Floor == Targetlocation.Floor;
- }
-
- private bool IsSamefloor(DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
- {
- return Sourcelocation.Floor == Targetlocation.Floor;
- }
private async Task DeleteStockInfoAsync(int stockId)
{
var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
@@ -1282,14 +2015,6 @@
}
}
- private async Task UpdateLocationAsync(DtLocationInfo info)
- {
- var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
- if (!isStockUpdated)
- {
- throw new Exception("搴撲綅淇℃伅鏇存柊澶辫触");
- }
- }
private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
{
@@ -1387,26 +2112,6 @@
return taskHty;
}
- /// <summary>
- /// 鏇存柊搴撳瓨浣嶇疆
- /// </summary>
- /// <param name="stock">搴撳瓨瀵硅薄</param>
- /// <param name="toLocation">鐩爣浣嶇疆</param>
- // 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
- private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
- {
- //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
- var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
- var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();
-
- // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
- stock.LocationCode = task.TargetAddress;
-
- // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
- return (stock, fromLocation, toLocation);
- }
#region 浠诲姟璇锋眰鏂规硶
@@ -1480,74 +2185,59 @@
/// <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:
+ return await FromShallowToDeep(AreaId, loc);
+ case 3:
+ return await AGVLIKU(AreaId);
+ case 5:
+ case 6:
+ return await FromDeepToShallow(AreaId, loc);
+ default:
+ return null;
}
}
@@ -1558,45 +2248,38 @@
/// <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);
+ bool Isavailable = true;
+ foreach (var lateral in locationLateral)
{
- 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);
- 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>
@@ -1606,143 +2289,104 @@
/// <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
+ 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 (locationInfos.Contains(Lateral))
+ continue;
+ if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
{
locationInfos.Add(item);
- continue;
- }
- foreach (var Lateral in locationLateral)
- {
- if (locationInfos.Contains(Lateral))
- continue;
- if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
- {
- locationInfos.Add(item);
- }
}
}
+ }
- return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+ return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+
}
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
+
+ int sum = 0;
+ 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)
{
- 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;
+
}
- private DtStockInfo CreatePalletStock(Dt_Task task, DtBoxingInfo boxing)
- {
- var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
- if (loation == null)
- throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
-
-
- var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
- var stock = new DtStockInfo()
- {
- PalletCode = task.PalletCode,
- LocationCode = task.TargetAddress,
- CreateDate = DateTime.Now,
- Creater = "system",
- IsFull = boxing.IsFull,
- StockInfoDetails = boxDetail,
- };
-
- stock.StockStatus = 1;
-
- return stock;
- }
#endregion 浠诲姟璇锋眰鏂规硶
--
Gitblit v1.9.3