From 1c7d84d153f22148c7c8dbf80aa646edb0c53648 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期四, 18 十二月 2025 09:24:57 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 47 ++++++++++++++++++++---------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 7aad3d7..28e5306 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -12,6 +12,7 @@
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -21,6 +22,7 @@
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
private readonly LogFactory LogFactory = new LogFactory();
+ //private readonly BDCManager bDCManager = new BDCManager();
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IDt_Task_HtyRepository _task_HtyRepository;
private readonly IMapper _mapper;
@@ -30,9 +32,12 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
private readonly IDt_PalletStockInfoRepository _palletStockInfoRepository;
- private readonly IDt_PalletStockInfoDetailRepository _palletStockInfoDetailRepository;
private readonly IDt_PalletStockInfo_htyRepository _palletStockInfo_HtyRepository;
- private readonly IBoxingInfoRepository _boxingInfoRepository;
+ private readonly IDt_CarBodyRepository _carBodyRepository;
+ private readonly IDt_BDCConfigurationRepository _bdcConfigurationRepository;
+ private readonly IDt_BDCConfigurationService _bdcConfigurationService;
+ private readonly IDt_RoadWayRepository _roadWayRepository;
+ private readonly IDt_RoadWayInfoRepository _roadWayInfoRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -42,7 +47,7 @@
ITaskExecuteDetailRepository taskExecuteDetailRepository,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository, IDt_PalletStockInfo_htyRepository palletStockInfo_HtyRepository, IBoxingInfoRepository boxingInfoRepository, IDt_PalletStockInfoDetailRepository palletStockInfoDetailRepository) : base(BaseDal)
+ ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository, IDt_PalletStockInfo_htyRepository palletStockInfo_HtyRepository, IDt_CarBodyRepository carBodyRepository, IDt_BDCConfigurationRepository bdcConfigurationRepository, IDt_BDCConfigurationService bDCConfigurationService, IDt_RoadWayRepository roadWayRepository, IDt_RoadWayInfoRepository roadWayInfoRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -55,8 +60,11 @@
_configService = configService;
_palletStockInfoRepository = palletStockInfoRepository;
_palletStockInfo_HtyRepository = palletStockInfo_HtyRepository;
- _boxingInfoRepository = boxingInfoRepository;
- _palletStockInfoDetailRepository = palletStockInfoDetailRepository;
+ _carBodyRepository = carBodyRepository;
+ _bdcConfigurationRepository = bdcConfigurationRepository;
+ _bdcConfigurationService = bDCConfigurationService;
+ _roadWayRepository = roadWayRepository;
+ _roadWayInfoRepository = roadWayInfoRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -85,14 +93,14 @@
var taskHty = CreateHistoricalTask(task);
//鑾峰彇缁勭洏淇℃伅
- var boxinginfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ var carBody = await _carBodyRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
// 鏍规嵁鍒涘缓搴撳瓨瀹炰緥妯″瀷
//var boxDetail = boxinginfo.BoxingInfoDetails.Adapt<List<Dt_PalletStockInfoDetail>>();
Dt_PalletStockInfo palletStockInfo = new Dt_PalletStockInfo
{
CreateDate = DateTime.Now,
-
+
Creater = task.Creater,
LocationCode = task.TargetAddress,
StockStatus = 2,
@@ -100,7 +108,7 @@
};
// 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(palletStockInfo, taskHty, locationInf, task.TaskId, boxinginfo);
+ bool isResult = await ExecuteTransaction(palletStockInfo, taskHty, locationInf, task.TaskId, carBody);
if (isResult)
{
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
@@ -141,7 +149,7 @@
stockInfo_Hty.FinishTime = DateTime.Now;
stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- var boxinfo = _boxingInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
+ var boxinfo = _carBodyRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -404,7 +412,7 @@
_unitOfWorkManage.CommitTran();
}
-
+
content.OK();
}
catch (Exception ex)
@@ -617,21 +625,6 @@
#endregion 鍐呴儴璋冪敤鏂规硶
#region private 鍐呴儴鏂规硶
-
-
- private async Task DeleteStockInfoDetailsAsync(IEnumerable<Dt_PalletStockInfoDetail> details)
- {
- if (details != null)
- {
- var ids = details.Select(x => (object)x.Id).ToArray();
- var isStockDetailUpdated = await _palletStockInfoDetailRepository.DeleteDataByIdsAsync(ids);
- if (!isStockDetailUpdated)
- {
- throw new Exception("搴撳瓨璇︽儏淇℃伅鏇存柊澶辫触");
- }
- }
- }
-
/// <summary>
/// 鍒涘缓鍘嗗彶浠诲姟璁板綍
/// </summary>
@@ -665,7 +658,7 @@
/// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
/// <param name="taskId">浠诲姟ID</param>
/// <returns></returns>
- private async Task<bool> ExecuteTransaction(Dt_PalletStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo)
+ private async Task<bool> ExecuteTransaction(Dt_PalletStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, Dt_CarBody boxingInfo)
{
_unitOfWorkManage.BeginTran();
try
@@ -678,7 +671,7 @@
//鍒犻櫎缁勭洏鏁版嵁
if (boxingInfo != null)
{
- var box = _boxingInfoRepository.DeleteData(boxingInfo);
+ var box = _carBodyRepository.DeleteData(boxingInfo);
//boxingInfo.CurrentStatue = 5;
//isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
// .Include(x => x.BoxingInfoDetails)
--
Gitblit v1.9.3