修改MES接口，优化托盘更换逻辑

dengjunjie

2024-04-19 c862dd0756111a4264666f7e7636a5a062cce806

 ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs

@@ -1,13 +1,17 @@
using Confluent.Kafka;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using OfficeOpenXml.FormulaParsing.Excel.Operators;
using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.MES_Info;
using WIDESEA_Comm.MES_Info.Request;
using WIDESEA_Common;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
using WIDESEA_Entity.ToAGV;
using WIDESEA_WMS.IRepositories;
using WIDESEA_WMS.Repositories;
using static WIDESEA_Comm.MES_Info.BasicSN;

namespace WIDESEA_WMS.Common.AGVTask
@@ -34,24 +38,45 @@
                {
                    throw new Exception("无任务数据");
                }

                VOLContext context = new VOLContext();
                IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);
                if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() /*|| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString()*/|| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())
                {
                    if(task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())
                {
                    foreach (var item in task.bindSN.Split(","))
                    {
                            var work = workinfoRepository.Find(x => x.SN == item && x.processCode == task.agv_worktype.ToString()).FirstOrDefault();
                        detail detail = new detail();
                        detail.sn = item;
                            detail.jobID = work.jobID;
                            detail.processCode = work.processCode;
                        list.Add(detail);
                    }
                    }
                    else
                    {
                        foreach (var item in task.bindSN.Split(","))
                        {
                            //var work = workinfoRepository.Find(x => x.SN == item && x.processCode == "28").FirstOrDefault();
                            detail detail = new detail();
                            detail.sn = item;
                            detail.jobID = task.jobID;
                            detail.processCode = task.agv_worktype.ToString();
                            list.Add(detail);
                        }
                    }
                    
                    agvInWarehousePara outWarehousePara = new agvInWarehousePara()
                    {
                        JobID = task.jobID,
                        WorkOrder = task.jobID,
                        zoneID = task.agv_fromaddress,
                        processCode = task.agv_worktype.ToString(),
                        //processCode = task.agv_worktype.ToString(),
                        details = list,
                        layerNo = 1,
                        stackID = "1",
                        warehouseName = "Agv库",
                        Operator="AGV自动",
                    };
                    obj = outWarehousePara;
                    ActionName = "agvOutWarehouse";//AGV->MES车轮出库
@@ -61,19 +86,23 @@
                {
                    foreach (var item in task.bindSN.Split(","))
                    {
                        var work = workinfoRepository.Find(x => x.SN == item && x.processCode == task.agv_worktype.ToString()).FirstOrDefault();
                        detail detail = new detail();
                        detail.sn = item;
                        detail.jobID = work.jobID;
                        detail.processCode = work.processCode;
                        list.Add(detail);
                    }
                    agvInWarehousePara inWarehousePara = new agvInWarehousePara()
                    {
                        JobID = task.jobID,
                        WorkOrder = task.jobID,
                        zoneID = task.agv_toaddress,
                        processCode = task.agv_worktype.ToString(),
                        //processCode = task.agv_worktype.ToString(),
                        details = list,
                        layerNo = 1,
                        stackID = "1",
                        warehouseName = "Agv库",
                        Operator = "AGV自动",
                    };
                    obj = inWarehousePara;
                    ActionName = "agvInWarehouse";//AGV->MES车轮入库
@@ -82,23 +111,25 @@
                //else if (task.agv_tasktype == "Transfer")  //移库区分  åº“内移库
                else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Carry.ToString())  //移库区分  åº“内移库
                {
                    List<detail1> list1 = new List<detail1>(); //车轮信息
                    foreach (var item in task.bindSN.Split(","))
                    {
                        detail detail = new detail();
                        detail1 detail = new detail1();
                        detail.sn = item;
                        list.Add(detail);
                        list1.Add(detail);
                    }
                    agvMoveWarehousePara moveWarehousePara = new agvMoveWarehousePara()
                    {
                        fromZoneID = task.agv_fromaddress,
                        toZoneID = task.agv_toaddress,
                        details = list,
                        details = list1,
                        fromLayerNo = "1",
                        fromStackID = "1",
                        fromWarehouseName = "Agv库",
                        toLayerNo = "1",
                        toStackID = "1",
                        toWarehouseName = "Agv库",
                        Operator = "AGV自动",
                    };
                    obj = moveWarehousePara;
                    ActionName = "agvMoveWarehouse";//AGV->MES车轮移库