Merge branch 'xiaoyang' into dev

wanshenmean

2 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs

@@ -525,7 +525,7 @@
                        PalletCode = currentTask.RobotSourceAddressPalletCode;  // 使用源地址的托盘码

                        if (isRoadway == "HCSC1")

                        {

                            warehouseId = 2;

                            warehouseId = 3;

                            roadway = "HCSC1";

                        }

                        else if (isRoadway == "GWSC1")

@@ -542,7 +542,7 @@
                        taskType = TaskTypeEnum.InEmpty.GetHashCode();  // 空托盘入库

                        PalletCode = currentTask.RobotSourceAddressPalletCode;  // 使用源地址的托盘码



                        warehouseId = 3;

                        warehouseId = 2;

                        roadway = "CWSC1";



                        SourceAddress = currentTask.RobotSourceAddressLineCode;

@@ -562,7 +562,7 @@


                        if (isRoadway == "HCSC1")

                        {

                            warehouseId = 2;

                            warehouseId = 3;

                            roadway = "HCSC1";

                        }

                        else if (isRoadway == "GWSC1")

@@ -627,6 +627,12 @@
            // 解析 WMS 返回的任务信息

            WMSTaskDTO taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(result.Data.Data.ToJson() ?? string.Empty) ?? new WMSTaskDTO();



            var task = await _taskService.Repository.QueryFirstAsync(x => x.PalletCode == taskDTO.PalletCode);

            if(task != null)

            {

                await _taskService.Repository.DeleteDataAsync(task);

            }



            // 调用任务服务接收 WMS 任务

            var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });

            if (!content.Status)