From b6a40a2d8fdcffb3accfc7e424c0726a87a59ddf Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 05 十二月 2025 21:20:59 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 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..0a6bc41 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,58 @@
 
 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 IMapper _mapper; // AutoMapper瀹炰緥
+    public Task_HtyService(IRepository<Dt_Task_Hty> BaseDal, IMapper mapper, ILogger<Task_HtyService> logger) : base(BaseDal)
     {
+        _mapper = mapper;
+        _logger = logger;
+    }
+    public bool DeleteAndMoveIntoHty(Dt_Task task, OperateTypeEnum operateType)
+    {
+       // using var transaction = Db.Ado.UseTran();
+        try
+        {
+           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