From e8323315b683a76509b9c1ecc717bb5b6a9ee08a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 14 四月 2026 18:07:04 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..2b93a1e 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"
@@ -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.浜哄伐鍒犻櫎);
--
Gitblit v1.9.3