From 28f1259ec675a191d2a852f74566400e6cc40b50 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 11 九月 2024 17:03:11 +0800
Subject: [PATCH] 前端问题改动，与代码优化
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 845ece9..0ef476a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -250,6 +250,7 @@
if (task != null)
{
+
// 鏇存柊鐜版湁浠诲姟
content = await UpdateExistingTask(input, areaInfo.AreaID, task);
}
@@ -665,6 +666,7 @@
int taskState;
string original = task.CurrentAddress;
DtLocationInfo location = new DtLocationInfo();
+ int beforeStatus = 0;
if (input.Type == (int)TaskTypeEnum.Outbound)
{
@@ -678,6 +680,7 @@
location = await GetLocationDistributeAsync(areaId, task.Roadway);
toAddress = location.LocationCode;
taskState = (int)InTaskStatusEnum.Line_InFinish;
+ beforeStatus = location.LocationStatus;
// 鏇存柊璐т綅淇℃伅
location.LocationStatus = (int)LocationEnum.Lock;
@@ -693,24 +696,25 @@
_unitOfWorkManage.BeginTran();
bool isUpdateLo = true;
bool isUpdateChange = true;
+
// 灏濊瘯鏇存柊浠诲姟
bool isResult = await BaseDal.UpdateDataAsync(task);
- bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, true, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, InTaskStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
+ bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, InTaskStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
if (input.Type != (int)TaskTypeEnum.Outbound)
{
- DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
+ LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
{
- ChangeType = task.TaskType,
- LocationCode = location.LocationCode,
- LocationId = location.Id,
- Creater = "System",
- TaskNum = task.TaskNum,
AfterStatus = location.LocationStatus,
- BeforeStatus = (int)LocationEnum.Free,
+ BeforeStatus = beforeStatus,
+ TaskNum = task.TaskNum.Value,
+ LocationId = location.Id,
+ LocationCode = location.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
};
- isUpdateChange = await _locationStatusChangeRecordRepository.AddDataAsync(dtLocationStatusChangeRecord) > 0;
+ isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
isUpdateLo = await _locationRepository.UpdateDataAsync(location);
}
+
if (isResult && isUpdateLo && isTaskDetail)
{
_unitOfWorkManage.CommitTran();
@@ -752,7 +756,7 @@
SourceAddress = input.Position,
TaskState = (int)InTaskStatusEnum.InNew,
TaskType = (int)TaskTypeEnum.Inbound,
- TaskNum = await BaseDal.GetTaskNo(),
+ TaskNum = await BaseDal.GetTaskNo(),
Creater = "Systeam"
};
// 灏濊瘯娣诲姞鏂颁换鍔�
--
Gitblit v1.9.3