优化堆垛逻辑和入库逻辑

dengjunjie

2024-04-01 19c66ba052a7fb26c4d27deaa75ae46479eee342

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

@@ -35,7 +35,7 @@
                    throw new Exception("无任务数据");
                }

                if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString())
                if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() /*|| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString()*/|| task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())
                {
                    foreach (var item in task.bindSN.Split(","))
                    {
@@ -45,13 +45,13 @@
                    }
                    agvInWarehousePara outWarehousePara = new agvInWarehousePara()
                    {
                        details = list,
                        JobID = task.jobID,
                        zoneID = task.agv_fromaddress,
                        processCode = task.agv_worktype.ToString(),
                        details = list,
                        layerNo = 1,
                        stackID = "1",
                        warehouseName = "Agv库",
                        zoneID = task.agv_fromaddress,
                    };
                    obj = outWarehousePara;
                    ActionName = "agvOutWarehouse";//AGV->MES车轮出库
@@ -67,13 +67,13 @@
                    }
                    agvInWarehousePara inWarehousePara = new agvInWarehousePara()
                    {
                        details = list,
                        JobID = task.jobID,
                        zoneID = task.agv_toaddress,
                        processCode = task.agv_worktype.ToString(),
                        details = list,
                        layerNo = 1,
                        stackID = "1",
                        warehouseName = "Agv库",
                        zoneID = task.agv_toaddress,
                    };
                    obj = inWarehousePara;
                    ActionName = "agvInWarehouse";//AGV->MES车轮入库
@@ -82,39 +82,51 @@
                //else if (task.agv_tasktype == "Transfer")  //移库区分  åº“内移库
                else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Carry.ToString())  //移库区分  åº“内移库
                {
                    foreach (var item in task.bindSN.Split(","))
                    {
                        detail detail = new detail();
                        detail.sn = item;
                        list.Add(detail);
                    }
                    agvMoveWarehousePara moveWarehousePara = new agvMoveWarehousePara()
                    {
                        fromZoneID = task.agv_fromaddress,
                        toZoneID = task.agv_toaddress,
                        details = list,
                        fromLayerNo = "1",
                        fromStackID = "1",
                        fromWarehouseName = "Agv库",
                        fromZoneID = task.agv_fromaddress,
                        toLayerNo = "1",
                        toStackID = "1",
                        toWarehouseName = "Agv库",
                        toZoneID = task.agv_toaddress,
                    };
                    obj = moveWarehousePara;
                    ActionName = "agvMoveWarehouse";//AGV->MES车轮移库
                    name = "AGV同步MES车轮AB库移库";
                }
                else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// å¤–协移库
                //else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// å¤–协移库
                //{
                //    var mes_head = FreeDB.Select<dt_mes_head>().Where(x => x.jobID == task.jobID).First();
                //    agvTransferListPara agvTransferListPara = new agvTransferListPara()
                //    {
                //        transferListID = task.agv_tasknum,
                //        materialCode = mes_head.materialCode,
                //        details = list,
                //        drawingNoVer = mes_head.drawingNoVer,
                //        fromWarehouse = "AGV库",
                //        toWarehouse = "毛轮库",
                //        Operator = task.agv_userid,
                //        updateTime = task.agv_createtime.ToString(),
                //    };
                //    obj = agvTransferListPara;
                //    ActionName = "agvTransferList";
                //    name = "AGV同步MES车轮移库AB库->BC库";
                //}
                else
                {
                    var mes_head = FreeDB.Select<dt_mes_head>().Where(x => x.jobID == task.jobID).First();
                    agvTransferListPara agvTransferListPara = new agvTransferListPara()
                    {
                        details = list,
                        transferListID = task.agv_tasknum,
                        materialCode = mes_head.materialCode,
                        drawingNoVer = mes_head.drawingNoVer,
                        fromWarehouse = "AGV库",
                        toWarehouse = "毛轮库",
                        Operator = task.agv_userid,
                        updateTime = task.agv_createtime.ToString(),
                    };
                    obj = agvTransferListPara;
                    ActionName = "agvTransferList";
                    name = "AGV同步MES车轮移库AB库->BC库";
                    requestMes.code = "200";
                    requestMes.Type = "success";
                    return requestMes;
                }

                var postJson = JsonConvert.SerializeObject(obj);