Merge branch 'dev' into xiaoyang

wanshenmean

20 小时以前 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61

 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs

@@ -19,6 +19,7 @@


        public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"];

        public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"];

        public string WCS_CancelTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_CancelTask"]; 


        /// <summary>

        /// 极卷库出入库申请

@@ -316,7 +317,7 @@
                InboundOrderRowNo = 1,

                Creater = StockConstants.AGV_USER,

                CreateDate = DateTime.Now,

                Remark = $"AGV入库任务创建，任务号：{dto.TaskId}"

                Remark = $"极卷库AGV入库任务创建，任务号：{dto.TaskId}"

            };



            // 创建库存主记录

@@ -328,7 +329,7 @@
                StockStatus = (int)StockStatusEmun.入库确认,

                Creater = StockConstants.AGV_USER,

                CreateDate = DateTime.Now,

                Remark = $"AGV入库任务创建，任务号：{dto.TaskId}",

                Remark = $"极卷库AGV入库任务创建，任务号：{dto.TaskId}",

                Details = new List<Dt_StockInfoDetail> { details }

            };



@@ -611,6 +612,11 @@
        private async Task<AGVResponse> CancelAgvInboundTask(Dt_Task task)

        {

            AGVResponse response = new AGVResponse();



            var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, task.TaskNum.ToString());

            if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)

                return response.Error(httpResponse?.Data?.Message ?? "下发WCS取消失败");



            task.TaskStatus = (int)TaskInStatusEnum.InCancel;

            

            _unitOfWorkManage.BeginTran();

@@ -644,6 +650,10 @@
        private async Task<AGVResponse> CancelAgvOutboundTaskAsync(Dt_Task task)

        {

            AGVResponse response = new AGVResponse();

            var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, task.TaskNum.ToString());

            if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)

                return response.Error(httpResponse?.Data?.Message ?? "下发WCS失败");



            var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);

            if (stockInfo == null)

                return response.Error($"未找到托盘{task.PalletCode}的库存信息");