1

heshaofeng

2026-03-27 6967501f2c484c04bb772ce9772247b0b8046bd1

1

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

@@ -607,7 +607,49 @@
        }
    }

 


    /// <summary>
    /// ä»»åŠ¡å–消请求参数
    /// </summary>
    public class TaskCancelRequest
    {
        /// <summary>
        /// ä»»åŠ¡ç¼–号列表（不能为空）
        /// </summary>
        [JsonProperty("taskCodes")]
        public List<string> TaskCodes { get; set; }
    }

    /// <summary>
    /// ä»»åŠ¡å–消返回结果
    /// </summary>
    public class TaskCancelResultItem
    {
        [JsonProperty("errorCode")]
        public string ErrorCode { get; set; }

        [JsonProperty("message")]
        public string Message { get; set; }

        [JsonProperty("taskCode")]
        public string TaskCode { get; set; }
    }

    public class TaskCancelResponseData
    {
        [JsonProperty("tasks")]
        public List<TaskCancelResultItem> Tasks { get; set; }
    }

    public class TaskCancelApiResponse
    {
        [JsonProperty("code")]
        public int Code { get; set; }

        [JsonProperty("msg")]
        public string Msg { get; set; }

        [JsonProperty("data")]
        public TaskCancelResponseData Data { get; set; }
    }
}

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

@@ -77,5 +77,7 @@
        HttpResponseResult<MesResponseDTO> responseModel(Dt_InboundOrder order, int InterfaceType, FeedbackInboundRequestModel model = null, AllocateDto allocateDto = null);

        Task<WebResponseContent> HandCompleteTask(string TaskNum);

        Task<WebResponseContent> TaskCancel(List<int> taskCodes);
    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_TakeStockOrder.cs

@@ -26,6 +26,7 @@
        /// <summary>
        /// ç›˜ç‚¹å•å·
        /// </summary>
        [CodeRule(RuleCodeEnum.PDCodeRule)]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "盘点单号")]
        public string OrderNo { get; set; }


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

@@ -27,6 +27,7 @@
using SqlSugar;
using System.Reflection;
using System.Reflection.Emit;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
using WIDESEA_BasicService;
@@ -98,6 +99,7 @@
        private readonly IRepository<Dt_TakeStockOrder> _takeStockOrder;
        public readonly IRepository<Dt_LocationType> _locationTypeRepository;
        public readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;
        private readonly IRepository<Dt_OutStockLockInfo> _outboundLockInfoRepository;
        public IRepository<Dt_Task> Repository => BaseDal;

        private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()
@@ -117,7 +119,7 @@

        public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();

        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService, IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, IRepository<Dt_AllocateMaterialInfo_Hty> allocateMaterialInfo_Hty, HttpClientHelper httpClientHelper, IBasicService basicService,IRepository<Dt_TakeStockOrder> takeStockOrder, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository) : base(BaseDal)
        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService, IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, IRepository<Dt_AllocateMaterialInfo_Hty> allocateMaterialInfo_Hty, HttpClientHelper httpClientHelper, IBasicService basicService,IRepository<Dt_TakeStockOrder> takeStockOrder, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_OutStockLockInfo> outboundLockInfoRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _unitOfWorkManage = unitOfWorkManage;
@@ -148,6 +150,7 @@
            _takeStockOrder = takeStockOrder;
            _locationTypeRepository = locationTypeRepository;
            _warehouseAreaRepository = warehouseAreaRepository;
            _outboundLockInfoRepository = outboundLockInfoRepository;
        }

        public async Task TaskStatusChange(string taskNum, TaskStatusEnum taskStatusEnum)
@@ -305,7 +308,7 @@
                }
            }
            stockInfo.LocationCode = task.TargetAddress;
            stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
            stockInfo.StockStatus = StockStatusEmun.入库确认.ObjToInt();
            stockInfo.Details.ForEach(x =>
            {
                x.Status = StockStatusEmun.入库确认.ObjToInt();
@@ -2451,6 +2454,135 @@
                return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
            }
        }

        /// <summary>
        /// ä»»åŠ¡å–消
        /// </summary>
        /// <param name="taskCodes"></param>
        /// <returns></returns>
        /// <summary>
        public async Task<WebResponseContent> TaskCancel(List<int> taskCodes)
        {
            try
            {
                if (taskCodes == null || !taskCodes.Any())
                {
                    return WebResponseContent.Instance.Error("取消的任务号不能为空");
                }

                //var taskCancelUrl = AppSettings.GetValue("TaskCancelUrl");
                //TaskCancelRequest taskc = new TaskCancelRequest();
                //taskc.TaskCodes = taskCodes.Select(x => x.ToString()).ToList();

                //string json = JsonConvert.SerializeObject(taskc);

                //using var clientHttp = new HttpClient();
                //var content = new StringContent(json, Encoding.UTF8, "application/json");

                //HttpResponseMessage response = await clientHttp.PostAsync(taskCancelUrl,content);

                //string responseJson = await response.Content.ReadAsStringAsync();
                //TaskCancelApiResponse apiResponse = JsonConvert.DeserializeObject<TaskCancelApiResponse>(responseJson);

                //if (apiResponse.Code != 0)
                //{
                //    return WebResponseContent.Instance.Error($"请求失败：{apiResponse.Msg}");
                //}
                _unitOfWorkManage.BeginTran();

                var tasks = await Db.Queryable<Dt_Task>()
                                    .Where(x => taskCodes.Contains(x.TaskNum))
                                    .ToListAsync();

                if (!tasks.Any())
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error("未找到对应的任务信息");
                }

                int inPickType = TaskTypeEnum.InPick.ObjToInt();
                var inboundTypes = new List<int>
        {
            TaskTypeEnum.InAllocate.ObjToInt(),
            TaskTypeEnum.InEmpty.ObjToInt(),
            TaskTypeEnum.Inbound.ObjToInt(),
            TaskTypeEnum.InInventory.ObjToInt(),
            TaskTypeEnum.InQuality.ObjToInt()
        };
                var outboundTypes = new List<int>
        {
            TaskTypeEnum.Outbound.ObjToInt(),
            TaskTypeEnum.OutAllocate.ObjToInt()
        };

                foreach (var task in tasks)
                {
                    if (task.TaskStatus == TaskStatusEnum.Cancel.ObjToInt())
                        continue;

                    var stock = await _stockRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
                    if (stock == null)
                        throw new Exception($"托盘 {task.PalletCode} æœªæ‰¾åˆ°åº“存信息");

                    if (task.TaskType == inPickType)
                    {
                        stock.StockStatus = StockStatusEmun.出库完成.ObjToInt();
                    }
                    else if (inboundTypes.Contains(task.TaskType))
                    {
                        stock.StockStatus = StockStatusEmun.组盘暂存.ObjToInt();
                    }
                    else if (outboundTypes.Contains(task.TaskType))
                    {
                        stock.StockStatus = StockStatusEmun.入库完成.ObjToInt();

                        var outStockLock = await _outStockLockInfoService.Db
                            .Queryable<Dt_OutStockLockInfo>()
                            .Where(x => x.PalletCode == task.PalletCode)
                            .FirstAsync();

                        if (outStockLock == null)
                            throw new Exception($"托盘 {task.PalletCode} æœªæ‰¾åˆ°å‡ºåº“锁定信息");

                        int detailId = outStockLock.OrderDetailIds.ObjToInt();
                        var outboundDetail = await _outboundOrderDetailService.Db
                            .Queryable<Dt_OutboundOrderDetail>()
                            .Where(x => x.Id == detailId)
                            .FirstAsync();

                        if (outboundDetail == null)
                            throw new Exception($"出库明细ID {detailId} ä¸å­˜åœ¨");

                        if (outboundDetail.LockQuantity < outStockLock.AssignQuantity)
                            throw new Exception($"出库明细 {detailId} é”å®šæ•°é‡ä¸è¶³");

                        outboundDetail.LockQuantity -= outStockLock.AssignQuantity;
                         _outboundOrderDetailService.UpdateData(outboundDetail);

                         _outboundLockInfoRepository.DeleteAndMoveIntoHty(outStockLock, OperateTypeEnum.人工删除);
                    }

                    await _stockRepository.UpdateDataAsync(stock);

                    task.TaskStatus = TaskStatusEnum.Cancel.ObjToInt();
                    bool archiveSuccess = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.人工删除);

                    if (!archiveSuccess)
                    {
                        await Db.Deleteable(task).ExecuteCommandAsync();
                    }
                }

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK("任务取消成功");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                _logger.LogError(ex, "任务取消异常");
                return WebResponseContent.Instance.Error($"任务取消失败：{ex.Message}");
            }
        }
    }
}


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

@@ -9,6 +9,7 @@
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -125,5 +126,11 @@
        {
            return await Service.HandCompleteTask(TaskNum);
        }

        [HttpPost, Route("TaskCancel"), AllowAnonymous]
        public async Task<WebResponseContent> TaskCancel(List<int> taskCancel)
        {
            return await Service.TaskCancel(taskCancel);
        }
    }
}