From 6513c35280f2283ff53b36bdc0c9d83aba475f8d Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期五, 07 三月 2025 19:54:24 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 17 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 b89f4b0..206447e 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"
@@ -263,7 +263,8 @@
//浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
return task;
}
- else {
+ else
+ {
//鏌ヨ澶╄溅绉诲姩浠诲姟
task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
if (task!=null)
@@ -277,17 +278,22 @@
//{
// throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
//}
- if (task.TaskState!= (int)TaskMoveStatusEnum.OutNewMove)
+ //if (task != null)
+ //{
+ // if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
+ // {
+
+ // }
+ //}
+ if (workTpe.Equals("In"))
{
- if (workTpe.Equals("In"))
- {
- task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
- }
- else if (workTpe.Equals("Out"))
- {
- task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
- }
+ task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
}
+ else if (workTpe.Equals("Out"))
+ {
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ }
+
}
catch (Exception)
{
@@ -445,7 +451,7 @@
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
- else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
}
@@ -597,6 +603,8 @@
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
}
+
+
if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
@@ -648,6 +656,7 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
+
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
_stockRepository.AddData(stock);
@@ -689,8 +698,24 @@
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);
@@ -717,12 +742,38 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
- //寮�濮嬫暟鎹簱浜嬪姟
- _unitOfWorkManage.BeginTran();
- _taskhtyRepository.AddData(taskhty);
- BaseDal.DeleteData(nawtask);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
+ if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ {
+ //寮�濮嬪垱寤轰换鍔�
+ 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);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
}
content = WebResponseContent.Instance.OK();
}
--
Gitblit v1.9.3