From 6c663b92b0078aa89657df22ec188dff65599f04 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 21 十月 2025 17:24:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1083 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 706 insertions(+), 377 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 e91b1a3..fb047f2 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"
@@ -2,13 +2,18 @@
using log4net.Core;
using Mapster;
using Masuit.Tools;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+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.Generic;
+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;
@@ -16,11 +21,13 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
+using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
+using WIDESEA_Model.Models.ERP;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
using static System.Collections.Specialized.BitVector32;
@@ -80,16 +87,33 @@
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";
+
+ //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);
+
+ UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+ content.OK("鍑哄簱瀹屾垚");
}
catch (Exception ex)
{
@@ -114,17 +138,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)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;
+
+ 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 DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
+ content.OK("绉诲簱瀹屾垚");
}
catch (Exception err)
{
@@ -147,16 +181,38 @@
WebResponseContent content = new WebResponseContent();
try
{
+ var boxing = 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)
+ {
+ return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
+ }
+
+ DtStockInfo stock = CreatePalletStock(task, boxing);
+ DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
+ boxingInfo_Hty.ModifyDate = DateTime.Now;
+
task.TaskState = (int)TaskInStatusEnum.InFinish;
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 _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();
+ UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ await AddBoxingHtyAsync(boxingInfo_Hty);
});
+ content.OK("鍏ュ簱瀹屾垚");
}
catch (Exception ex)
{
@@ -177,8 +233,8 @@
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);
+ //UpdateLocationStatus(Sourcelocation, LocationEnum.Free);
+ //UpdateLocationStatus(Targetlocation, LocationEnum.InStock);
task.TaskState = (int)TaskAGVCarryStatusEnum.CarryFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -251,8 +307,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)
{
@@ -266,14 +321,6 @@
{
return await CompleteTransferTaskAsync(task, stock);
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
- {
- return await CompleteCarryTaskAsync(task, stock);
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
- {
- return await CompleteAcrossFloorTaskAsync(task, stock);
- }
else
{
return content.Error("鏈壘鍒颁换鍔＄被鍨�");
@@ -282,30 +329,138 @@
#endregion 浠诲姟瀹屾垚
- #region 璇锋眰浠诲姟鍏ュ簱
-
- public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto taskDto)
+ #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)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode);
+ 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();
+ // if (ERPStock == null)
+ // {
+ // return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
+ // }
+ //}
+
+ var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+ if (StartAddress == null)
+ {
+ return content.Error("璧风偣搴撲綅鏈壘鍒�");
+ }
+ if (!LocationIsOutBound(StartAddress))
+ {
+ return content.Error($"璧风偣搴撲綅{StartAddress.LocationCode}鎼繍璺緞琚崰鐢紝璇蜂汉宸ョ‘璁ゅ啀涓嬪彂浠诲姟");
+ }
+ if (taskDto.AreaId != 0)
+ {
+ switch (taskDto.AreaId)
+ {
+ case 1:
+ return await InboundStakerArea(taskDto, StartAddress, await GetEmptyLocation("SC1"));
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ return await InboundAGVCacheArea(taskDto, StartAddress, await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress));
+ 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)
+ {
+ switch (location.AreaId)
+ {
+ case 1:
+ return await InboundStakerArea(taskDto, StartAddress, location);
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ return await InboundAGVCacheArea(taskDto, StartAddress, location);
+ default:
+ return content.Error("璐т綅鍖哄煙鏈壘鍒�");
+ }
+ }
+ else
+ {
+ return content.OK("鐩爣搴撲綅涓嶅彲鐢�");
+ }
+ }
+ else
+ {
+ return content.OK("璇烽�夋嫨鍏ュ簱鍖哄煙鎴栫粓鐐瑰湴鍧�");
+ }
+ }
+ catch (Exception err)
+ {
+ return content.Error(err.Message);
+ }
+ }
+
+ public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress, DtLocationInfo location)
+ {
+ WebResponseContent content = new WebResponseContent();
try
{
var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
- var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- var TargetAddress = await GetEmptyLocation("SC1");
-
- if (location == null || TargetAddress == null)
+ if (location == null)
{
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
+ return content.Error("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
}
-
Dt_Task taskNew = new Dt_Task
{
Grade = 1,
Roadway = "SC1",
- TargetAddress = TargetAddress.LocationCode,
+ TargetAddress = location.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = station.stationChildCode,
@@ -323,24 +478,60 @@
};
var taskDTO = CreateListTaskDTO(taskNew);
- var isResult = await AddTaskAsync(taskNew, location,TargetAddress);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
- }
+ 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 err)
+ catch (Exception ex)
{
- content.Error(err.Message);
+ _unitOfWorkManage.RollbackTran();
+ return content.Error(ex.Message);
}
-
- return content;
}
+ public async Task<WebResponseContent> InboundAGVCacheArea(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, (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);
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error(ex.Message);
+ }
+ }
#endregion 璇锋眰浠诲姟鍏ュ簱
#region 鏇存柊浠诲姟鐘舵��
@@ -434,60 +625,23 @@
#endregion
-
#region 璇锋眰鍑哄簱
-
- /// <summary>
- /// 璇锋眰鎵樼洏浠诲姟
- /// </summary>
- /// <param name="position">鐩爣浣嶇疆</param>
- /// <param name="tag">鎵樼洏绫诲瀷锛�1锛氬疄鐩橈紝2锛氱┖鐩橈級</param>
- /// <param name="areaCode">鍖哄煙缂栫爜</param>
- /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> RequestOutTaskAsync(RequestTaskDto taskDto)
+ public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
- var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
-
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(2, Sourcelocation);
- if (Targetlocation == null || Sourcelocation == null)
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (stcok == null)
{
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
+ return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
}
- Dt_Task taskNew = new Dt_Task
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
+ if (location.AreaId == 2)
{
- Grade = 1,
- Roadway = "SC1",
- TargetAddress = Targetlocation.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = station.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.Outbound,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = "1F",
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- return content = await SendWCSTask(taskDTO);
+ return await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode ,TaskType = (int)TaskOutboundTypeEnum.OutOther });
}
catch (Exception ex)
{
@@ -496,6 +650,162 @@
}
+ /// <summary>
+ /// 璇锋眰鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> RequestOutboundTaskAsync(RequestTaskDto taskDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ 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("璇烽�夋嫨姝ｇ‘鐨勫尯鍩熶俊鎭�");
+ }
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public async Task<WebResponseContent> 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)
+ {
+ 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);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ 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 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 璇锋眰璺ㄦゼ灞�2浠诲姟
@@ -534,7 +844,7 @@
SourceAddress = task.SourceAddress,
CurrentAddress = stationManager.stationChildCode,
TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarry,
- TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
+ TaskType = task.TaskType,
TaskNum = BaseDal.GetTaskNo().Result,
CreateDate = DateTime.Now,
TaskId = 0,
@@ -542,16 +852,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);
}
@@ -564,248 +875,75 @@
#endregion
#region 璇锋眰璺ㄦゼ灞備换鍔�
- public async Task<WebResponseContent> RequestAcrossFloorTaskAsync(RequestTaskDto taskDto)
+ public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress,DtLocationInfo EndAddress,int TaskType,string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
-
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId, Sourcelocation);
-
- if (Targetlocation == null || Sourcelocation == null)
+ var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == StartAddress.Floor);
+ return new Dt_Task
{
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
-
- if (IsAcrossFloor(Sourcelocation, Targetlocation))
- {
- return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
- }
-
- if (Sourcelocation != null)
- {
- var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == Sourcelocation.Floor);
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = Targetlocation.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = next.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
- TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = Sourcelocation.Floor,
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
-
- var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
- }
-
- return content = await SendWCSTask(taskDTO);
- }
- return content.Error("鏈壘鍒版彁鍗囨満绔欑偣");
+ 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 content.Error(ex.Message);
+ return null;
}
}
-
- public async Task<WebResponseContent> RequestPointAcrossFloorTaskAsync(RequestTaskDto taskDto)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.TargetAddress);
-
- if (Targetlocation == null || Sourcelocation == null)
- {
- return content.Error("璧风偣鎴栫粓鐐规湭瀹氫箟");
- }
-
- if (IsAcrossFloor(Sourcelocation, Targetlocation))
- {
- return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
- }
- if (Sourcelocation != null)
- {
- var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == Sourcelocation.Floor);
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = Targetlocation.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = next.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
- TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = Sourcelocation.Floor,
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
-
- var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
- }
-
- return content = await SendWCSTask(taskDTO);
- }
- return content.Error("鏈壘鍒版彁鍗囨満绔欑偣");
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
#endregion
#region 璇锋眰AGV鎼繍浠诲姟
- public async Task<WebResponseContent> RequestAGVCarryTaskAsync(RequestTaskDto taskDto)
+ public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId,Sourcelocation);
-
- if (Targetlocation == null || Sourcelocation == null)
+ return new Dt_Task
{
- return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
-
- if (!IsSamefloor(Sourcelocation, Targetlocation))
- {
- return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
- }
-
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
+ Grade = StartAddress.Column,
Roadway = "AGV",
- TargetAddress = Targetlocation.LocationCode,
+ TargetAddress = EndAddress.LocationCode,
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = Targetlocation.LocationCode,
+ NextAddress = EndAddress.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
+ PalletCode = palletCode,
+ SourceAddress = StartAddress.LocationCode,
+ CurrentAddress = StartAddress.LocationCode,
TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = (int)TaskAGVCarryTypeEnum.Carry,
+ TaskType = TaskType,
TaskNum = BaseDal.GetTaskNo().Result,
CreateDate = DateTime.Now,
TaskId = 0,
+ Remark = StartAddress.AreaId.ToString(),
AGVTaskNum = GenerateUniqueId(),
- Floor = Sourcelocation.Floor,
+ Floor = StartAddress.Floor,
};
- var taskDTO = CreateListTaskDTO(taskNew);
-
- UpdateLocationStatus(Sourcelocation, LocationEnum.InStockDisable);
- UpdateLocationStatus(Targetlocation, LocationEnum.Lock);
-
- var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
- }
-
- //return content = await SendWCSTask(taskDTO);
- return content.OK();
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ return null;
}
}
-
- public async Task<WebResponseContent> RequestPointAGVCarryTaskAsync(RequestTaskDto taskDto)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
-
- var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.TargetAddress);
-
- if (Targetlocation == null || Sourcelocation == null)
- {
- return content.Error("璧风偣鎴栫粓鐐规湭瀹氫箟");
- }
-
- if (!IsSamefloor(Sourcelocation, Targetlocation))
- {
- return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
- }
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = Targetlocation.LocationCode,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = Targetlocation.LocationCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = (int)TaskAGVCarryTypeEnum.Carry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = Sourcelocation.Floor,
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏂板浠诲姟澶辫触");
- }
-
- return content = await SendWCSTask(taskDTO);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
#endregion
#region 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -830,19 +968,19 @@
if (location == null || location.Depth != 2)
{
- return content.Error("鏈壘鍒拌揣浣嶆垨鑰呰搴撲綅涓嶆槸浜屾繁璐т綅");
+ return content.OK(data: _mapper.Map<WMSTaskDTO>(task));
}
var locationLateral = _locationRepository.QueryFirst(x => x.RoadwayNo == location.RoadwayNo && x.Row == 1 && x.Layer == location.Layer && x.Column == location.Column);
- if (locationLateral != null && (locationLateral.LocationStatus == 0 || locationLateral.EnalbeStatus == 1))
+ if (locationLateral != null && (locationLateral.LocationStatus == (int)LocationEnum.FreeDisable || locationLateral.LocationStatus == (int)LocationEnum.Free) && locationLateral.EnalbeStatus == 1)
{
return content.OK(data: _mapper.Map<WMSTaskDTO>(task));
}
- else if (locationLateral != null && (locationLateral.LocationStatus == 1 || locationLateral.EnalbeStatus == 1))
+ else if (locationLateral != null && locationLateral.LocationStatus == 1 && locationLateral.EnalbeStatus == 1)
{
return content.Error($"涓�娣变綅寮傚父閿佸畾鏆備笉鍙嚭搴�");
}
- else if (locationLateral != null && (locationLateral.LocationStatus == 2 || locationLateral.EnalbeStatus == 1))
+ else if (locationLateral != null && locationLateral.LocationStatus == (int)LocationEnum.InStockDisable && locationLateral.EnalbeStatus == 1)
{
var TargetAddress = await GetEmptyLocation("SC1");
@@ -852,7 +990,7 @@
}
//todo鏌ヨ鍐呬晶搴撳瓨淇℃伅
- var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == locationLateral.LocationCode && x.LocationId == locationLateral.Id);
+ var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == locationLateral.LocationCode);
Dt_Task taskNew = new Dt_Task
{
@@ -863,7 +1001,7 @@
MaterialNo = "",
NextAddress = TargetAddress.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode+"001",
+ PalletCode = taskDto.PalletCode + "001",
SourceAddress = locationLateral.LocationCode,
CurrentAddress = locationLateral.LocationCode,
TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -876,6 +1014,8 @@
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();
@@ -934,7 +1074,7 @@
foreach (var item in locationInfos)
{
- if (item.LocationStatus == 0 && item.EnalbeStatus == 1)
+ if ((item.LocationStatus == 0 || item.LocationStatus == (int)LocationEnum.FreeDisable) && item.EnalbeStatus == 1)
{
continue;
}
@@ -961,7 +1101,7 @@
SourceAddress = item.LocationCode,
CurrentAddress = item.LocationCode,
TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = (int)TaskAGVCarryTypeEnum.CarryReloction,
+ TaskType = (int)TaskRelocationTypeEnum.Relocation,
TaskNum = BaseDal.GetTaskNo().Result,
CreateDate = DateTime.Now,
TaskId = 0,
@@ -972,6 +1112,7 @@
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();
@@ -1008,11 +1149,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;
@@ -1026,7 +1188,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());
@@ -1036,13 +1198,69 @@
}
#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;
+ }
+
+ public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
+ 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 = item.Warehouse,
+ TransInQty = item.Quantity,
+ TransOutWHCode = "001",
+ }).ToList()
+ };
+ return content.OK(data: allocate);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion
+
#region 鍐呴儴璋冪敤鏂规硶
- public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus)
+ public void 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)
{
@@ -1091,6 +1309,24 @@
}
}
}
+ List<LocationChangeRecordDto> changeRecordDto = new List<LocationChangeRecordDto>();
+ foreach (var item in Beforelocation)
+ {
+ var loc = locations.Where(x => x.LocationCode == item.LocationCode).FirstOrDefault();
+ if (loc != null)
+ {
+ changeRecordDto.Add(new LocationChangeRecordDto()
+ {
+ AfterStatus = loc.LocationStatus,
+ BeforeStatus = item.LocationStatus,
+ TaskNum = taskNum,
+ LocationId = loc.Id,
+ LocationCode = loc.LocationCode,
+ ChangeType = StatusChangeType,
+ });
+ }
+ }
+ _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
_locationRepository.UpdateData(locations);
}
@@ -1168,15 +1404,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);
@@ -1195,14 +1422,24 @@
}
}
- private async Task UpdateLocationAsync(DtLocationInfo info)
+ private async Task DeleteBoxingInfoAsync(int boxingId)
{
- var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
+ var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(boxingId);
if (!isStockUpdated)
{
- throw new Exception("搴撲綅淇℃伅鏇存柊澶辫触");
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
}
}
+
+ private async Task AddBoxingHtyAsync(DtBoxingInfo_Hty boxingInfo)
+ {
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(boxingInfo).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("缁勭洏鍘嗗彶淇℃伅娣诲姞澶辫触");
+ }
+ }
+
private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
{
@@ -1300,26 +1537,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 浠诲姟璇锋眰鏂规硶
@@ -1337,7 +1554,7 @@
TaskNum = task.TaskNum.Value,
LocationId = location.Id,
LocationCode = location.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
};
bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
@@ -1346,42 +1563,43 @@
return isResult && isUpdateLo;
}
- private async Task<bool> AddTaskAsync(Dt_Task task, DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
+ private async Task<bool> AddTaskAsync(Dt_Task task, DtLocationInfo StartAddress, DtLocationInfo EndAddress)
{
+ //UpdateLocationStatus
bool isResult = await BaseDal.AddDataAsync(task) > 0;
- int SourcebeforeStatus = Sourcelocation.LocationStatus;
+ int SourcebeforeStatus = StartAddress.LocationStatus;
- int TargetbeforeStatus = Targetlocation.LocationStatus;
+ int TargetbeforeStatus = EndAddress.LocationStatus;
- Sourcelocation.LocationStatus = (int)LocationEnum.InStockDisable;
+ StartAddress.LocationStatus = (int)LocationEnum.InStockDisable;
- Targetlocation.LocationStatus = (int)LocationEnum.Lock;
+ EndAddress.LocationStatus = (int)LocationEnum.Lock;
List<LocationChangeRecordDto> changeRecordDto = new List<LocationChangeRecordDto>()
{
new LocationChangeRecordDto()
{
- AfterStatus = Sourcelocation.LocationStatus,
+ AfterStatus = StartAddress.LocationStatus,
BeforeStatus = SourcebeforeStatus,
TaskNum = task.TaskNum.Value,
- LocationId = Sourcelocation.Id,
- LocationCode = Sourcelocation.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticDelivery,
+ LocationId = StartAddress.Id,
+ LocationCode = StartAddress.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
},
new LocationChangeRecordDto()
{
- AfterStatus = Targetlocation.LocationStatus,
+ AfterStatus = EndAddress.LocationStatus,
BeforeStatus = TargetbeforeStatus,
TaskNum = task.TaskNum.Value,
- LocationId = Targetlocation.Id,
- LocationCode = Targetlocation.LocationCode,
- ChangeType = (int)StatusChangeTypeEnum.AutomaticDelivery,
+ LocationId = EndAddress.Id,
+ LocationCode = EndAddress.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
},
};
bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
- bool Source = await _locationRepository.UpdateDataAsync(Sourcelocation);
- bool Target = await _locationRepository.UpdateDataAsync(Targetlocation);
+ bool Source = await _locationRepository.UpdateDataAsync(StartAddress);
+ bool Target = await _locationRepository.UpdateDataAsync(EndAddress);
return isResult && Source && Target;
}
@@ -1395,6 +1613,11 @@
try
{
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();
@@ -1413,7 +1636,7 @@
}
}
- return locationInfos.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ 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)
{
@@ -1434,24 +1657,23 @@
{
try
{
- DtLocationInfo location = null;
+ if(loc==null)
+ {
+ return null;
+ }
switch (AreaId)
{
case 2:
- location = await FromShallowToDeep(AreaId, loc);
- break;
+ return await FromShallowToDeep(AreaId, loc);
case 3:
- location = await AGVLIKU(AreaId);
- break;
+ return await AGVLIKU(AreaId);
case 5:
case 6:
- location = await FromDeepToShallow(AreaId, loc);
- break;
+ return await FromDeepToShallow(AreaId, loc);
default:
- break;
+ return null;
}
- return location;
}
catch (Exception ex)
{
@@ -1470,22 +1692,36 @@
{
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);
-
+ 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)
{
- if (lateral.LocationStatus == (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
+ if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
{
- locationInfos.Add(item);
+ Isavailable = false;
+ continue;
}
}
+ if(Isavailable)
+ locationInfos.Add(item);
}
- return locationInfos.OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ return locationInfos.Distinct().OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
}
catch (Exception ex)
{
@@ -1504,8 +1740,15 @@
{
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);
-
+ 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;
@@ -1514,8 +1757,15 @@
foreach (var item in locations)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
+ if (locationLateral.Count == 0)
+ {
+ locationInfos.Add(item);
+ continue;
+ }
foreach (var Lateral in locationLateral)
{
+ if (locationInfos.Contains(Lateral))
+ continue;
if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
{
locationInfos.Add(item);
@@ -1523,13 +1773,15 @@
}
}
- return locationInfos.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();
@@ -1545,6 +1797,83 @@
}
}
+
+ public bool LocationIsOutBound(DtLocationInfo location)
+ {
+ try
+ {
+ int sum = 0;
+ if (location.AreaId == 1)
+ {
+ if (location.Depth == 2)
+ {
+ 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;
+ }
+ }
+ }
+
+ 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)
+ {
+ return false;
+ }
+ }
+
+ 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 浠诲姟璇锋眰鏂规硶
#endregion private 鍐呴儴鏂规硶
--
Gitblit v1.9.3