Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-11-16 cf83e0828b286b61b69a15005e6247d8b03f4cd8

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs

@@ -19,7 +19,12 @@
{
    public partial class TaskService 
    {

        /// <summary>
        /// ESS鎵爜璇锋眰鍏ュ簱
        /// </summary>
        /// <param name="palletCode"></param>
        /// <param name="stationCode"></param>
        /// <returns></returns>
        public async Task<WebResponseContent> RequestInboundTask(string palletCode, string stationCode)
        {
            try
@@ -45,7 +50,7 @@
                    return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
                }

                Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation();
                Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation(stockInfo.LocationType);
                if (locationInfo == null)
                {
                    return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
@@ -65,7 +70,8 @@
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    WarehouseId = stockInfo.WarehouseId,
                    PalletType = stockInfo.PalletType,

                    OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo
                    
                };
                //绌虹
                if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
@@ -131,12 +137,24 @@
                            }
                    }
                };
                _logger.LogInformation("鍒涘缓浠诲姟Request:  " + JsonConvert.SerializeObject(esstask));
 
                var result = await _eSSApiService.CreateTaskAsync(esstask);

                _logger.LogInformation("鍒涘缓浠诲姟杩斿洖:  " + result);
                if (result)
                {
                    try
                    {
                        await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
                        {
                            slotCode = stationCode,
                            containerCode = palletCode
                        });
                    }
                    catch (Exception ex) { 
                    

                    }
                    return WebResponseContent.Instance.OK();
                }
                else