Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

肖洋

2024-12-10 578c0eefb1f2e945c4d22ddcd1ab5d20b9c036f6

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -521,7 +521,7 @@
            };
            content.OK(data: taskDTO);


           
        }
        else
            content.Error("添加任务失败");
@@ -599,7 +599,7 @@
                    PalletCode = input.PalletCode,
                    SourceAddress = stationManager.stationLocation,
                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
                    TaskType = (int)TaskOutboundTypeEnum.OutNG,
                    TaskType = (int)TaskOutboundTypeEnum.InToOut,
                    TaskNum = await BaseDal.GetTaskNo(),
                    Creater = "Systeam"
                };
@@ -712,7 +712,7 @@
                    PalletCode = input.PalletCode,
                    SourceAddress = stationManager.stationLocation,
                    TaskState = (int)TaskInStatusEnum.Line_InFinish,
                    TaskType = (int)TaskOutboundTypeEnum.OutNG,
                    TaskType = (int)TaskOutboundTypeEnum.InToOut,
                    TaskNum = await BaseDal.GetTaskNo(),
                    Creater = "Systeam"
                };
@@ -763,8 +763,9 @@
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
        };

        ConsoleHelper.WriteSuccessLine($"修改前：" + locationInfo.LocationStatus.ToString());
        locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
        ConsoleHelper.WriteSuccessLine($"修改后：" + locationInfo.LocationStatus.ToString());
        await UpdateLocationAsync(locationInfo);

        return task;
@@ -789,7 +790,7 @@
            }
            else
            {
                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Distribute && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
            }

            if (locations == null)
@@ -868,7 +869,6 @@
        }
    }


    #region 直接出库任务完成
    public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
    {
@@ -890,6 +890,46 @@
    }
    #endregion


    #region MyRegion
    //private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
    //{
    //    _unitOfWorkManage.BeginTran();
    //    try
    //    {
    //        var isUpdateStock = true;

    //        // 添加历史任务
    //        var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;

    //        // 修改移库前货位状态
    //        var isUpdateLoc = _locationRepository.UpdateData(locationInfo);

    //        // 删除任务数据
    //        var isTaskDelete = await Delete(taskId);

    //        // 提交或回滚事务
    //        if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
    //        {
    //            LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新或添加库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
    //            _unitOfWorkManage.CommitTran();
    //            return true;
    //        }
    //        else
    //        {
    //            LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"数据处理失败,请检查数据是否正确,数据回滚。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
    //            _unitOfWorkManage.RollbackTran();
    //            return false;
    //        }
    //    }
    //    catch (Exception err)
    //    {
    //        LogFactory.GetLog("任务完成").InfoFormat(true, $"任务完成,系统异常，异常信息：{err.Message}", "无参数");
    //        _unitOfWorkManage.RollbackTran();
    //        throw; // 抛出异常以便外部捕获
    //    }
    //}
    #endregion

    #region 检测高温库是否有可出库库存

@@ -985,36 +1025,37 @@
        {
            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTO.Position);
            var locations = _locationRepository.QueryData(x => x.RoadwayNo == station.Roadway && x.LocationStatus == (int)LocationEnum.Free && x.LocationType == 1);
            ConsoleHelper.WriteSuccessLine(station.Roadway);
            var taskRun = BaseDal.QueryData(x => x.TaskType == (int)TaskOutboundTypeEnum.OutTray && x.Roadway.Contains("CW"));


            ConsoleHelper.WriteSuccessLine(locations.Count.ToString());

            ConsoleHelper.WriteSuccessLine(taskRun.Count.ToString());
            var number = locations.Count - taskRun.Count;
            ConsoleHelper.WriteSuccessLine(number.ToString());
            if (number > 10)
            if (locations.Count > 10)
            {
                ConsoleHelper.WriteColorLine(number.ToString(), ConsoleColor.Blue);
                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1", new List<string>());
                ConsoleHelper.WriteColorLine(locations.Count.ToString(), ConsoleColor.Blue);

                var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

                var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);
                var stockInfo = await QueryStockInfoForEmptyTrayAsync("CWSC1");

                // 创建任务DTO
                WMSTaskDTO wmsTask = CreateTaskDTO(task);

                // 更新库存位置状态为不可用
                stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
                await _unitOfWorkManage.UseTranAsync(async () =>
                if (stockInfo != null)
                {
                    await BaseDal.AddDataAsync(task);
                    await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
                });
                    var task = CreateTask(stockInfo, taskDTO.Position, (int)TaskOutboundTypeEnum.OutTray);

                // 返回成功响应
                return content.OK(data: wmsTask);
                    // 创建任务DTO
                    WMSTaskDTO wmsTask = CreateTaskDTO(task);

                    // 更新库存位置状态为不可用
                    stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
                    location.LocationStatus = (int)LocationEnum.Distribute;
                    await _unitOfWorkManage.UseTranAsync(async () =>
                    {
                        await BaseDal.AddDataAsync(task);
                        await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
                        await _locationRepository.UpdateDataAsync(location);
                    });

                    // 返回成功响应
                    return content.OK(data: wmsTask);
                }
                else
                    content.Error("常温空托盘数量不足");
            }
        }
        catch (Exception ex)