From eb72ad7c5ec8f4f0cd8b291d16534a10e9eb113c Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期一, 10 三月 2025 14:50:01 +0800
Subject: [PATCH] 后端
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 304 ++++++++++++++++++++++++++++++++------------------
1 files changed, 195 insertions(+), 109 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 17d369e..5619d95 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -50,6 +50,7 @@
private readonly IRepository<dt_errormsgInfo> _errorinfoRepository;
private readonly Idt_ErrormsginfoService _ErrormsginfoService;
private readonly IMapper _mapper;
+ private readonly IRepository<dt_stationInfo> _dt_stationInfoRepository;
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
@@ -78,6 +79,7 @@
IRepository<dt_batchInfo> batchRepository,
IRepository<Dt_Task_hty> taskhtyRepository,
IRepository<dt_errormsgInfo> errorinfoRepository,
+ IRepository<dt_stationInfo> dt_stationInfoRepository,
Idt_ErrormsginfoService errormsginfoService,
IUnitOfWorkManage unitOfWorkManage,
IMapper mapper) : base(BaseDal)
@@ -93,6 +95,7 @@
_errorinfoRepository = errorinfoRepository;
_ErrormsginfoService = errormsginfoService;
_mapper = mapper;
+ _dt_stationInfoRepository = dt_stationInfoRepository;
}
/// <summary>
@@ -621,127 +624,210 @@
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
}
-
-
+
if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
- var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
- //鏂板缓搴撳瓨
- Dt_StockInfo stock = new Dt_StockInfo();
- stock.LocationCode = nawtask.TargetAddress;
- stock.Weight = (decimal)weight;
- stock.StockStatus = (int)stockEnum.Free;
- stock.BatchNo = batck.InBatch;
- if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�");
+ string sourceAddress = station.Row + "-" + station.Column + "-1";
+ if (nawtask.SourceAddress.Equals(sourceAddress))
{
- stock.Remark = (int)MateTypeEnum.ZiChan;
+ var batck = _batchinfoRepository.QueryFirst(v => v.Id == 1);
+ //鏂板缓搴撳瓨
+ Dt_StockInfo stock = new Dt_StockInfo();
+ stock.LocationCode = nawtask.TargetAddress;
+ stock.Weight = (decimal)weight;
+ stock.StockStatus = (int)stockEnum.Free;
+ stock.BatchNo = batck.InBatch;
+ stock.Remark = 3;
+ //淇敼璐т綅淇℃伅
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
+ location.LocationStatus = (int)LocationStatusEnum.InStock;
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.AddData(stock);
+ _locationRepository.UpdateData(location);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
}
else
{
- stock.Remark = (int)MateTypeEnum.WaiGou;
+ var batck = _batchinfoRepository.QueryFirst(v => v.Id == 1);
+ //鏂板缓搴撳瓨
+ Dt_StockInfo stock = new Dt_StockInfo();
+ stock.LocationCode = nawtask.TargetAddress;
+ stock.Weight = (decimal)weight;
+ stock.StockStatus = (int)stockEnum.Free;
+ stock.BatchNo = batck.InBatch;
+ if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+ {
+ stock.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stock.Remark = (int)MateTypeEnum.WaiGou;
+ }
+ Dt_StockInfo stockTow = new Dt_StockInfo();
+ stockTow.LocationCode = nawtask.NextAddress;
+ stockTow.Weight = (decimal)weight;
+ stockTow.StockStatus = (int)stockEnum.Free;
+ stockTow.BatchNo = batck.InBatch;
+ if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+ {
+ stockTow.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stockTow.Remark = (int)MateTypeEnum.WaiGou;
+ }
+ //淇敼璐т綅淇℃伅
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
+ location.LocationStatus = (int)LocationStatusEnum.InStock;
+ //淇敼璐т綅淇℃伅
+ var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.AddData(stock);
+ _stockRepository.AddData(stockTow);
+ _locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationtow);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
}
- Dt_StockInfo stockTow = new Dt_StockInfo();
- stockTow.LocationCode = nawtask.NextAddress;
- stockTow.Weight = (decimal)weight;
- stockTow.StockStatus = (int)stockEnum.Free;
- stockTow.BatchNo = batck.InBatch;
- if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
- {
- stockTow.Remark = (int)MateTypeEnum.ZiChan;
- }
- else
- {
- stockTow.Remark = (int)MateTypeEnum.WaiGou;
- }
- //淇敼璐т綅淇℃伅
- var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
- location.LocationStatus = (int)LocationStatusEnum.InStock;
- //淇敼璐т綅淇℃伅
- var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
- locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
- //澶勭悊浠诲姟淇℃伅
- Dt_Task_hty taskhty = new Dt_Task_hty();
- taskhty.TaskNum = nawtask.TaskNum;
- taskhty.Roadway = nawtask.Roadway;
- taskhty.TaskType = nawtask.TaskType;
- taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
- taskhty.SourceAddress = nawtask.SourceAddress;
- taskhty.TargetAddress = nawtask.TargetAddress;
- taskhty.ExceptionMessage = nawtask.ExceptionMessage;
- taskhty.Grade = nawtask.Grade;
- taskhty.Dispatchertime = nawtask.Dispatchertime;
- taskhty.Remark = nawtask.Remark;
- taskhty.PalletCode = nawtask.PalletCode;
- taskhty.NextAddress = nawtask.NextAddress;
- taskhty.CurrentAddress = nawtask.CurrentAddress;
-
- //寮�濮嬫暟鎹簱浜嬪姟
- _unitOfWorkManage.BeginTran();
- _stockRepository.AddData(stock);
- _stockRepository.AddData(stockTow);
- _locationRepository.UpdateData(location);
- _locationRepository.UpdateData(locationtow);
- _taskhtyRepository.AddData(taskhty);
- BaseDal.DeleteData(nawtask);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
}
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- //鏌ユ壘搴撳瓨
- var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
- if (stock == null)
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ string targetAddress = station.Row + "-" + station.Column + "-1";
+ if (nawtask.TargetAddress.Equals(targetAddress))
{
- throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
+ //鏌ユ壘搴撳瓨
+ var stock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+ if (stock == null)
+ {
+ throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
+ }
+ //淇敼璐т綅鐘舵��
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+ location.LocationStatus = (int)LocationStatusEnum.Free;
+ //鍑嗗鍘嗗彶浠诲姟鏁版嵁
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ //寮�濮嬫暟鎹簱浜嬪姟
+
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.DeleteData(stock);
+ _locationRepository.UpdateData(location);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
}
- var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
- //淇敼璐т綅鐘舵��
- var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
- location.LocationStatus = (int)LocationStatusEnum.Free;
- //淇敼璐т綅鐘舵��
- var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
- locationTow.LocationStatus = (int)LocationStatusEnum.Free;
- //鍑嗗鍘嗗彶浠诲姟鏁版嵁
- Dt_Task_hty taskhty = new Dt_Task_hty();
- taskhty.TaskNum = nawtask.TaskNum;
- taskhty.Roadway = nawtask.Roadway;
- taskhty.TaskType = nawtask.TaskType;
- taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
- taskhty.SourceAddress = nawtask.SourceAddress;
- taskhty.TargetAddress = nawtask.TargetAddress;
- taskhty.ExceptionMessage = nawtask.ExceptionMessage;
- taskhty.Grade = nawtask.Grade;
- taskhty.Dispatchertime = nawtask.Dispatchertime;
- taskhty.Remark = nawtask.Remark;
- taskhty.PalletCode = nawtask.PalletCode;
- taskhty.NextAddress = nawtask.NextAddress;
- taskhty.CurrentAddress = nawtask.CurrentAddress;
- //濡傛灉鏀捐揣浣嶇疆琛屾槸40锛屽垯绔嬮┈鐢熸垚涓�鏉＄Щ鍔ㄤ换鍔�
- //寮�濮嬪垱寤轰换鍔�
- Dt_Task Movstask = new Dt_Task();
- Movstask.Roadway = "TC01";
- Movstask.TaskType = (int)TaskMoveEnum.Mowe;
- Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
- Movstask.SourceAddress = "0";
- Movstask.TargetAddress = "1-5-1";
- Movstask.NextAddress = "text";
- Movstask.Grade = 1;
- Movstask.WMSId = 3;
- Movstask.Remark = 0;
- Movstask.PalletCode = "text";
- Movstask.CurrentAddress = "text";
- //寮�濮嬫暟鎹簱浜嬪姟
-
- _unitOfWorkManage.BeginTran();
- BaseDal.AddData(Movstask);
- _stockRepository.DeleteData(stock);
- _stockRepository.DeleteData(Towstock);
- _locationRepository.UpdateData(location);
- _locationRepository.UpdateData(locationTow);
- _taskhtyRepository.AddData(taskhty);
- BaseDal.DeleteData(nawtask);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
+ else
+ {
+ //鏌ユ壘搴撳瓨
+ var stock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+ if (stock == null)
+ {
+ throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
+ }
+ var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ //淇敼璐т綅鐘舵��
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
+ location.LocationStatus = (int)LocationStatusEnum.Free;
+ //淇敼璐т綅鐘舵��
+ var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationTow.LocationStatus = (int)LocationStatusEnum.Free;
+ //鍑嗗鍘嗗彶浠诲姟鏁版嵁
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ //濡傛灉鏀捐揣浣嶇疆琛屾槸40锛屽垯绔嬮┈鐢熸垚涓�鏉＄Щ鍔ㄤ换鍔�
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task Movstask = new Dt_Task();
+ Movstask.Roadway = "TC01";
+ Movstask.TaskType = (int)TaskMoveEnum.Mowe;
+ Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ Movstask.SourceAddress = "0";
+ Movstask.TargetAddress = "1-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
+ //寮�濮嬫暟鎹簱浜嬪姟
+
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(Movstask);
+ _stockRepository.DeleteData(stock);
+ _stockRepository.DeleteData(Towstock);
+ _locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationTow);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
}
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
{
--
Gitblit v1.9.3