美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
2024-12-24 18d1f45193e34e00fc1b6f65b8596ddb29c5267d 
 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -92,13 +92,15 @@


        /// ä»»åŠ¡ä¿¡æ¯æŽ¨é€è‡³WCS


        /// </summary>


        /// <returns></returns>


        public WebResponseContent PushTasksToWCS()


        public WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "")


        {


            try


            {


                List<Dt_Task> tasks = BaseDal.QueryData(x => (TaskTypes.Contains(x.TaskType) && x.TaskStatus == (int)TaskStatusEnum.New));


                List<WMSTaskDTO> taskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);




                taskDTOs.ForEach(x =>


                {


                    x.AGVArea = agvDescription;


                });


                string response = HttpHelper.Post("http://127.0.0.1:9291/api/Task/ReceiveTask", taskDTOs.Serialize());




                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");


@@ -160,7 +162,7 @@


                locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();




                //测试架入库库存状态


                if (task.TaskType == TaskTypeEnum.TestInbound.ObjToInt())


                if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())


                {


                    stockInfo.StockStatus = StockStatusEmun.入库完成未建出库单.ObjToInt();


                    stockInfo.Details.ForEach(x =>


@@ -177,7 +179,7 @@


                _unitOfWorkManage.BeginTran();


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.人工完成 : OperateTypeEnum.自动完成);




                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);


                _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);




                _stockRepository.StockInfoRepository.UpdateData(stockInfo);


                _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);


@@ -250,7 +252,7 @@




                int beforeStatus = locationInfo.LocationStatus;


                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();


                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);


                _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);




                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, (LocationStatusEnum)beforeStatus, LocationChangeType.OutboundCompleted, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);