1

huangxiaoqiang

2025-12-18 ff7fbe2823021c709e811d58d20b5ef2e5695cff

1

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -360,7 +360,7 @@
                               }).ToList();
                            allocatefeedmodel.Details = groupedData;

                            var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
                            //var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);

                            var response = responseModel(inboundOrder, 3, "http://127.0.0.1:450/api/AldAllocationOperation/AllocationOperation", null, allocatefeedmodel);
                            if (response != null && response.IsSuccess)
@@ -509,10 +509,12 @@
            if (model != null)
            {
                httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, model.Serialize());
                requestData = model.Serialize();
            }
            else
            {
                httpResponseResult = _httpClientHelper.Post<MesResponseDTO>(apiUrl, allocateDto.Serialize());
                requestData = allocateDto.Serialize();
            }
            httpResponseResult.ApiUrl = apiUrl;
            bool isSuccess = httpResponseResult.IsSuccess && httpResponseResult.Data.Code == "200";

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs

@@ -13,51 +13,56 @@
public class Task_HtyService : ServiceBase<Dt_Task_Hty, IRepository<Dt_Task_Hty>>, ITask_HtyService
{
    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) : base(BaseDal)
    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
        {
           var historyEntity = _mapper.Map<Dt_Task_Hty>(task);
            _taskRepository.DeleteAndMoveIntoHty(task, operateType);

            // 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($"任务历史表Dt_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;

           //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($"任务历史表Dt_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)
        {