From 36343b85b0c883ebfdf3c17b173f263fd2bfcb93 Mon Sep 17 00:00:00 2001 From: 陈勇 <chenyong@hnkhzn.com> Date: 星期二, 19 十一月 2024 10:25:53 +0800 Subject: [PATCH] 合并 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs index 5ccc088..dbd507b 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs @@ -1,4 +1,5 @@ -锘縰sing WIDESEA_DTO; +锘縰sing WIDESEA_Common; +using WIDESEA_DTO; namespace WIDESEA_StorageBasicService; @@ -82,7 +83,26 @@ } } - + public override WebResponseContent UpdateData(SaveModel saveModel) + { + int id = saveModel.MainData["id"].ObjToInt(); + int status = saveModel.MainData["locationStatus"].ObjToInt(); + var location = BaseDal.QueryFirst(x => x.Id == id); + + LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto() + { + AfterStatus = status, + BeforeStatus = location.LocationStatus, + TaskNum = 0, + LocationId = id, + LocationCode = location.LocationCode, + ChangeType = (int)StatusChangeTypeEnum.ManualOperation + }; + + _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto); + + return base.UpdateData(saveModel); + } #region 鍒涘缓鍘熷璐т綅鏁版嵁 @@ -115,7 +135,7 @@ LocationType = locType, Remark = "", Depth = locType > 1 ? (((line - 1) % 4) + 1) == 2 || (((line - 1) % 4) + 1) == 3 ? 1 : 2 : 1, - RoadwayNo = locType > 1 ? $"SC{((line - 1) / 4) + 1}" : $"SC{((line - 1) / 2) + 1}", + RoadwayNo = locType > 1 ? $"FRSC{((line - 1) / 4) + 1}" : $"FRSC{((line - 1) / 2) + 1}", LocationStatus = LocationEnum.Free.ObjToInt(), AreaId = areaId, Creater = "systeam", @@ -225,7 +245,7 @@ SourceAddress = originalLocationID, TaskNum = taskNo, TargetAddress = emptyLocation.LocationCode, - TaskState = InTaskStatusEnum.RelocationNew.ObjToInt(), + //TaskState = TaskInStatusEnum.RelocationNew.ObjToInt(), TaskType = TaskTypeEnum.RelocationIn.ObjToInt(), }; @@ -304,8 +324,6 @@ } #endregion 鍒涘缓鍒濆璐т綅鏂规硶 - - #endregion 鍐呴儴鏂规硶 } \ No newline at end of file -- Gitblit v1.9.3