From fe596f9db05103917c9257348edcbd3ecb5b46e8 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 16 四月 2026 19:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index a939d58..87e298c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -392,7 +392,7 @@
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK||dt_Task.TaskType == (int)TaskTypeEnum.STUPTBY;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK || dt_Task.TaskType == (int)TaskTypeEnum.STUPTBY;
//淇敼鍘熸湰浠诲姟浼樺厛绾�
dt_Task.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
@@ -523,7 +523,7 @@
var kls = new List<Dt_KLSLocationInfo>();
var hk = new List<Dt_HKLocationInfo>();
List<Dt_StationInfo> pk = new List<Dt_StationInfo>();
- if (wMSUpdateLocationArea==null)
+ if (wMSUpdateLocationArea == null)
{
return content.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
@@ -1155,7 +1155,8 @@
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
EnableStatus = item.EnableStatus,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode,
+ AreaCode = item.WarehouseId
});
}
@@ -1175,7 +1176,8 @@
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
EnableStatus = item.EnableStatus,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode,
+ AreaCode = item.WarehouseId
});
}
content.OK(data: list);
@@ -1209,7 +1211,8 @@
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
EnableStatus = item.EnableStatus,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode,
+ AreaCode = item.WarehouseId
});
}
content.OK(data: list);
@@ -1247,7 +1250,9 @@
LoctionCode = item.StationCode,
LocationStatus = item.StationStatus,
EnableStatus = item.IsOccupied,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode,
+ AreaCode = item.StationRegion
+
});
}
content.OK(data: list);
@@ -1526,7 +1531,10 @@
{
// 鏌ユ壘鎵�鏈変换鍔′腑鍖呭惈杩欎釜id鐨�
var take = BaseDal.QueryData(x => keys.Contains(x.TaskId));
-
+ foreach (var item in take)
+ {
+ item.Modifier = App.User.UserName;
+ }
// 鎵ц绉诲叆鍘嗗彶鎿嶄綔锛屽苟妫�鏌ョ粨鏋�
bool moveResult = BaseDal.DeleteAndMoveIntoHty(take, OperateTypeEnum.浜哄伐鍒犻櫎);
@@ -1777,7 +1785,7 @@
var station = _stationInfo.Repository.QueryFirst(x => x.StationCode == locationCode);
if (station != null)
{
- station.IsOccupied = upLocationStatusDTO.EnableStatus==0?0:1;
+ station.IsOccupied = upLocationStatusDTO.EnableStatus == 0 ? 0 : 1;
locationsToUpdate.Add(station);
resultList.Add(new
--
Gitblit v1.9.3