From 387731cab892804912e68cb91e6fb804411c4756 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 27 十月 2025 23:32:16 +0800
Subject: [PATCH] 优化与ERP出库单逻辑，增加打印程序
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1321 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 820 insertions(+), 501 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 fb047f2..1738269 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"
@@ -9,6 +9,7 @@
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Reflection;
@@ -23,11 +24,15 @@
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_OrderRepository;
+using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
using static System.Collections.Specialized.BitVector32;
@@ -95,25 +100,87 @@
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;
+ 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 = null;
+ if (task.TaskType != (int)TaskOutboundTypeEnum.Outbound)
+ {
+ var stockDetailsToRemove = new List<DtStockInfoDetail>();
+
+ // 澶勭悊搴撳瓨鏄庣粏
+ if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
+ {
+ // 褰撳簱瀛樻槑缁嗕负绌烘椂锛屽皢鏁翠釜搴撳瓨绉诲叆鍘嗗彶琛�
+ stockInfo_Hty = CreateStockInfoHty(stock, null, true);
+ }
+ else
+ {
+ foreach (var item in stock.StockInfoDetails.ToList())
+ {
+ if (item.OutboundQuantity <= 0 || item.OutboundQuantity > item.Quantity)
+ {
+ throw new Exception($"鍑哄簱鏁伴噺寮傚父锛岀墿鏂� {item.MaterielCode} 鐨勫嚭搴撴暟閲� {item.OutboundQuantity} 涓嶅悎娉�");
+ }
+
+ if (item.OutboundQuantity == item.Quantity)
+ {
+ // 瀹屽叏鍑哄簱锛岀Щ鍏ュ巻鍙茶〃
+ if (stockInfo_Hty == null)
+ {
+ stockInfo_Hty = CreateStockInfoHty(stock, new List<DtStockInfoDetail> { item }, false);
+ }
+ else
+ {
+ stockInfo_Hty.StockInfoDetails.Add(CreateStockInfoDetailHty(item));
+ }
+ stockDetailsToRemove.Add(item);
+ }
+ else if (item.OutboundQuantity < item.Quantity && item.OutboundQuantity > 0)
+ {
+ // 閮ㄥ垎鍑哄簱锛屾洿鏂版暟閲�
+ item.Quantity -= item.OutboundQuantity;
+ item.OutboundQuantity = 0; // 閲嶇疆鍑哄簱鏁伴噺
+ }
+ }
+
+ // 绉婚櫎宸插畬鍏ㄥ嚭搴撶殑鏄庣粏
+ foreach (var item in stockDetailsToRemove)
+ {
+ stock.StockInfoDetails.Remove(item);
+ }
+ }
+ }
+
await _unitOfWorkManage.UseTranAsync(async () =>
{
- //await DeleteStockInfoAsync(stock.Id);
- //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- //await AddStockInfoHtyAsync(stockInfo_Hty);
- _stockInfoRepository.UpdateData(stock);
+ // 濡傛灉搴撳瓨鏄庣粏鍏ㄩ儴鍑哄簱瀹屾瘯锛屽垹闄ゅ師搴撳瓨璁板綍
+ if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
+ {
+ await _stockInfoRepository.DeleteDataAsync(stock);
+ }
+ else
+ {
+ _stockInfoRepository.UpdateData(stock);
+ }
+ // 娣诲姞鍘嗗彶璁板綍
+ if (stockInfo_Hty != null)
+ {
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ }
- UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
content.OK("鍑哄簱瀹屾垚");
+
}
catch (Exception ex)
{
@@ -122,7 +189,54 @@
return content;
}
-
+ private DtStockInfo_Hty CreateStockInfoHty(DtStockInfo stock, List<DtStockInfoDetail> details, bool isFullExit)
+ {
+ var stockInfoHty = new DtStockInfo_Hty()
+ {
+ PalletCode = stock.PalletCode,
+ LocationCode = stock.LocationCode,
+ IsFullExit = isFullExit,
+ StockStatus = stock.StockStatus,
+ OrderNo = stock.OrderNo,
+ OrderType = stock.OrderType,
+ Remark = stock.Remark,
+ StockInfoDetails = new List<DtStockInfoDetail_Hty>()
+ };
+
+ if (details != null)
+ {
+ foreach (var detail in details)
+ {
+ stockInfoHty.StockInfoDetails.Add(CreateStockInfoDetailHty(detail));
+ }
+ }
+
+ return stockInfoHty;
+ }
+
+ /// <summary>
+ /// 鍒涘缓搴撳瓨鏄庣粏鍘嗗彶璁板綍
+ /// </summary>
+ private DtStockInfoDetail_Hty CreateStockInfoDetailHty(DtStockInfoDetail detail)
+ {
+ return new DtStockInfoDetail_Hty
+ {
+ MaterielCode = detail.MaterielCode,
+ MaterielName = detail.MaterielName,
+ DemandClassification = detail.DemandClassification,
+ Warehouse = detail.Warehouse,
+ OrderNo = detail.OrderNo,
+ Unit = detail.Unit,
+ Specs = detail.Specs,
+ Weight = detail.Weight,
+ Quantity = detail.Quantity,
+ OutboundQuantity = detail.OutboundQuantity,
+ Status = detail.Status,
+ DrawingNumber = detail.DrawingNumber,
+ Date = detail.Date,
+ Remark = detail.Remark
+ };
+ }
#endregion 鍑哄簱浠诲姟瀹屾垚
@@ -149,11 +263,12 @@
stock.ModifyDate = DateTime.Now;
stock.LocationCode = task.TargetAddress;
-
+ var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
await _unitOfWorkManage.UseTranAsync(async () =>
{
//UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
_stockInfoRepository.UpdateData(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
@@ -181,18 +296,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>();
@@ -200,17 +313,18 @@
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.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+
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);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
+ await _locationRepository.UpdateDataAsync(result2.Item2);
+ await _locationRepository.UpdateDataAsync(result1.Item2);
});
content.OK("鍏ュ簱瀹屾垚");
}
@@ -221,7 +335,21 @@
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鎼繍浠诲姟瀹屾垚
@@ -370,7 +498,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("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
@@ -394,37 +523,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 (location.AreaId)
+ switch (Endlocation.AreaId)
{
case 1:
- return await InboundStakerArea(taskDto, StartAddress, location);
+ taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
+ break;
case 2:
case 3:
case 4:
case 5:
case 6:
- return await InboundAGVCacheArea(taskDto, StartAddress, location);
+ taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
+ break;
default:
return content.Error("璐т綅鍖哄煙鏈壘鍒�");
}
@@ -436,8 +573,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)
{
@@ -445,92 +597,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 璇锋眰浠诲姟鍏ュ簱
@@ -626,27 +740,80 @@
#endregion
#region 璇锋眰鍑哄簱
- public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
if (stcok == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
}
+
+ if (stcok.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+
var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
if (location.AreaId == 2)
{
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- return await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode ,TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
+
+ 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);
+ });
+ return content = await SendWCSTask(taskDto);
}
catch (Exception ex)
{
return content.Error(ex.Message);
}
+ }
+
+ 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);
}
@@ -655,156 +822,117 @@
/// </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 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -875,73 +1003,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
@@ -1211,7 +1328,57 @@
return wcsBasez + address;
}
- public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
+ /// <summary>
+ /// 鐢熶骇棰嗘枡
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> ERPProduction(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ Dt_Task task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ MaterialRequisition allocate = 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 = new List<issueList>()
+ {
+ new issueList
+ {
+ //澶囨枡ID
+ PickListID = task.OrderNo,
+ //瀛樺偍鍦扮偣
+ WhCode = "204",
+ //棰嗘枡鏁伴噺
+ IssueQty = task.OrderNo,
+ }
+ }
+ };
+ 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> ERPAllocate(string palletCode)
{
WebResponseContent content = new WebResponseContent();
try
@@ -1230,12 +1397,136 @@
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
- transferInList = stock.StockInfoDetails.Select(item => new transferInList
+ transferInList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = item.Remark==""? item.Warehouse: item.Remark,
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = "201",
+ }).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> ERPMixedSend(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
+ 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 = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscShipList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //瀛樺偍鍦扮偣缂栧彿
+ WhCode = item.Warehouse,
+ //鏉傚彂鏁伴噺
+ Qty = item.OutboundQuantity,
+ BenefitDeptCode = "0505",
+ }).ToList()
+ };
+ return content.OK(data: send);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(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,
- TransInWHCode = item.Warehouse,
- TransInQty = item.Quantity,
- TransOutWHCode = "001",
+ 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);
@@ -1246,12 +1537,11 @@
}
}
-
#endregion
#region 鍐呴儴璋冪敤鏂规硶
- public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
+ public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
{
List<DtLocationInfo> locations = GetGroupLocations(location);
@@ -1309,26 +1599,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)
@@ -1610,74 +1990,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;
}
}
@@ -1688,45 +2053,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>
@@ -1736,143 +2094,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