From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
index 73bd716..9edbe69 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
@@ -1,5 +1,10 @@
-锘縰sing WIDESEA_Core.BaseRepository;
+锘縰sing AutoMapper;
+using Microsoft.Extensions.Logging;
+using System.Transactions;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -7,7 +12,63 @@
public class Task_HtyService : ServiceBase<Dt_Task_Hty, IRepository<Dt_Task_Hty>>, ITask_HtyService
{
- public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal) : base(BaseDal)
+ private readonly ILogger<Task_HtyService> _logger;
+ private readonly IRepository<Dt_Task> _taskRepository;
+ private readonly IMapper _mapper; // AutoMapper瀹炰緥
+ public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal, IMapper mapper, ILogger<Task_HtyService> logger, IRepository<Dt_Task> taskRepository) : base(BaseDal)
{
+ _mapper = mapper;
+ _logger = logger;
+ _taskRepository = taskRepository;
+ }
+ public bool DeleteAndMoveIntoHty(Dt_Task task, OperateTypeEnum operateType)
+ {
+ // using var transaction = Db.Ado.UseTran();
+ try
+ {
+ _taskRepository.DeleteAndMoveIntoHty(task, operateType);
+
+ return true;
+
+ //var historyEntity = _mapper.Map<Dt_Task_Hty>(task);
+
+ // // 2. 濉厖鍘嗗彶瀹炰綋鏍稿績瀛楁
+ // historyEntity.SourceId = task.TaskId;
+ // historyEntity.OperateType = App.User?.UserName != null ? OperateTypeEnum.鑷姩瀹屾垚.ToString() : OperateTypeEnum.浜哄伐瀹屾垚.ToString();
+ // historyEntity.Creater = App.User?.UserName != null ? App.User.UserName : "System";
+
+ // // 瑕嗙洊淇敼浜�/淇敼鏃堕棿锛堜紭鍏堢骇楂樹簬鏄犲皠锛�
+ //// historyEntity.Modifier = App.User?.UserId > 0 ? App.User?.UserName : "System";
+ //// historyEntity.ModifyDate = DateTime.Now;
+
+ // // 3. 鎻掑叆鍘嗗彶琛紙绫诲瀷瀹夊叏锛屾棤鍙嶅皠鎷兼帴琛ㄥ悕锛�
+
+ // int insertCount = Db.Insertable(historyEntity).ExecuteCommand();
+
+ // if (insertCount <= 0)
+ // {
+ // _logger.LogError($"浠诲姟鍘嗗彶琛―t_Task_Hty [{task.TaskNum}]鎻掑叆澶辫触锛屽奖鍝嶈鏁颁负0");
+ // // transaction.RollbackTran();
+ // return false;
+ // }
+
+ // // 4. 鍒犻櫎鍘熷疄浣擄紙绫诲瀷瀹夊叏锛�
+ // int deleteCount = Db.Deleteable(task).ExecuteCommand();
+ // if (deleteCount <= 0)
+ // {
+ // _logger.LogError("浠诲姟涓氬姟瀹炰綋[{0}]鍒犻櫎澶辫触锛屽奖鍝嶈鏁颁负0", task.TaskNum);
+ // // transaction.RollbackTran();
+ // return false;
+ // }
+ // //transaction.CommitTran();
+ // _logger.LogInformation("浠诲姟瀹炰綋[{0}]宸叉垚鍔熺Щ鍏ュ巻鍙茶〃[{1}]骞跺垹闄ゅ師鏁版嵁", task.TaskNum);
+ // return true;
+ }
+ catch (Exception ex)
+ {
+ // transaction.RollbackTran();
+ _logger.LogError(ex, "浠诲姟鍒犻櫎瀹炰綋[{0}]骞剁Щ鍏ュ巻鍙茶〃澶辫触", task.TaskNum);
+ return false;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3