From 8c8532db8fc7fa76b7fe4c254a36d67c6af24ace Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 11 六月 2025 14:46:33 +0800
Subject: [PATCH] 添加物料编码字段并更新查询逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 133 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 127 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..81c370b 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,10 @@
-锘縰sing WIDESEA_DTO;
+锘縰sing AngleSharp.Dom;
+using Mapster;
+using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Core;
+using WIDESEA_DTO;
+using WIDESEA_Model.Models;
namespace WIDESEA_StorageBasicService;
@@ -7,11 +13,14 @@
private readonly LogFactory LogFactory = new LogFactory();
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_TaskService _taskService;
private readonly IStockInfoRepository _stockInfoRepository;
+ private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
private readonly IPointStackerRelationRepository _pointStackerRelationRepository;
private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly IMapper _mapper;
public LocationInfoService(ILocationInfoRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -20,7 +29,10 @@
IDt_WareAreaInfoRepository wareAreaInfoRepository,
IPointStackerRelationRepository pointStackerRelationRepository,
ITaskExecuteDetailRepository taskExecuteDetailRepository,
- ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
+ ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
+ IStockInfoDetailRepository stockInfoDetailRepository,
+ IMapper mapper,
+ IDt_TaskService taskService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_taskRepository = taskRepository;
@@ -29,6 +41,9 @@
_pointStackerRelationRepository = pointStackerRelationRepository;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
+ _stockInfoDetailRepository = stockInfoDetailRepository;
+ _mapper = mapper;
+ _taskService = taskService;
}
/// <summary>
@@ -82,7 +97,75 @@
}
}
-
+ 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 鍒濆鍖栧簱浣�
+ public async Task<WebResponseContent> initializeLocation(int locationID)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtLocationInfo? location = BaseDal.QueryData(x => x.Id == locationID).FirstOrDefault();
+ int LastStatus = location.LocationStatus;
+ if (location == null)
+ {
+ return content.Error("鏈壘鍒拌揣浣嶄俊鎭�!");
+ }
+ DtStockInfo stock = _stockInfoRepository.QueryFirst(x => x.LocationId == location.Id);
+ if(stock == null)
+ {
+ location.LocationStatus= (int)LocationEnum.Lock;
+ BaseDal.UpdateData(location);
+ }
+ else
+ {
+ _unitOfWorkManage.BeginTran();
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
+ await DeleteStockInfoAsync(stock.Id);
+ List<DtStockInfoDetail> detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id).ToList();
+ if (detail != null && detail.Count() > 0)
+ {
+ List<DtStockInfoDetail_Hty> details = detail.Adapt<List<DtStockInfoDetail_Hty>>();
+ await DeleteStockInfoDetailsAsync(detail);
+ AddStockInfoDetailHty(details);
+ }
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+
+
+ location.LocationStatus = (int)LocationEnum.Lock;
+ BaseDal.UpdateData(location);
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, LastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
+ _unitOfWorkManage.CommitTran();
+ }
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error(ex.Message);
+ }
+ }
+ #endregion
#region 鍒涘缓鍘熷璐т綅鏁版嵁
@@ -115,10 +198,10 @@
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 ? $"CHSC{((line - 1) / 4) + 1}" : $"CHSC{((line - 1) / 2) + 1}",
LocationStatus = LocationEnum.Free.ObjToInt(),
AreaId = areaId,
- Creater = "systeam",
+ Creater = "System",
EnalbeStatus = 2,
});
}
@@ -225,7 +308,7 @@
SourceAddress = originalLocationID,
TaskNum = taskNo,
TargetAddress = emptyLocation.LocationCode,
- TaskState = InTaskStatusEnum.RelocationNew.ObjToInt(),
+ //TaskState = TaskInStatusEnum.RelocationNew.ObjToInt(),
TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
};
@@ -305,7 +388,45 @@
#endregion 鍒涘缓鍒濆璐т綅鏂规硶
+ #region 搴撳瓨绉诲叆鍘嗗彶
+ private async Task DeleteStockInfoAsync(int stockId)
+ {
+ var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
+ if (!isStockUpdated)
+ {
+ throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
+ {
+ var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
+ if (!isStockAdd)
+ {
+ throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
+ }
+ }
+
+ private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
+ {
+ var ids = details.Select(x => (object)x.Id).ToArray();
+ var isStockDetailUpdated = await _stockInfoDetailRepository.DeleteDataByIdsAsync(ids);
+ if (!isStockDetailUpdated)
+ {
+ throw new Exception("搴撳瓨璇︽儏淇℃伅鏇存柊澶辫触");
+ }
+ }
+ private void AddStockInfoDetailHty(List<DtStockInfoDetail_Hty> details)
+ {
+
+ var isStockAdd = SqlSugarHelper.DbWMS.Insertable(details).ExecuteCommand();
+ if (isStockAdd==0)
+ {
+ throw new Exception("搴撳瓨鏄庣粏鍘嗗彶淇℃伅娣诲姞澶辫触");
+ }
+ }
+ #endregion
#endregion 鍐呴儴鏂规硶
}
\ No newline at end of file
--
Gitblit v1.9.3