优化工单信息页面

dengjunjie

2024-07-19 7a4c218909936721fe281737491d10efc7378e09

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs

@@ -34,6 +34,7 @@
                Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
                Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(context);
                Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(context);
                IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(context);

                var Pipeline_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "链条机");
                if (Pipeline_client == null) throw new Exception("链条机调度服务未开启！");
@@ -43,6 +44,9 @@

                foreach (var item in stationinfos)
                {
                    //判定任务是否已创建//如已存在  
                    if (agvtaskRepository.Find(x => x.agv_fromaddress == item.stationCode).Any())
                        continue;

                    var PalletSignal = Pipeline_client.ReadByOrder<Int16>("R_PalletSignal", item.stationCode);//读取托盘信号:1:有,2无
                    var MaterialSignal = Pipeline_client.ReadByOrder<Int16>("R_MaterialSignal", item.stationCode);//读取货物信号:1:有,2无
@@ -50,105 +54,35 @@

                    //根据下料口的绑定信息查询对应工单，检测此工单是否已完成  å®Œæˆå³å¯å°†å…¶é€å…¥åº“

                    dt_mes_head mesinfo = mes_HeadRepository.Find(x => x.jobID == item.Number).FirstOrDefault();
                    if (mesinfo == null)
                    var work = workinfoRepository.Find(x => x.workOrder == item.Number && x.drawingNo == item.stationType && x.heatID == item.heatNumber && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();
                    if (work == null)
                    {
                        item.remark = "触发入库任务,但未找到工单头表！";
                        item.remark = "触发入库任务,但未找到工单信息！";
                        item.location_state = LocationStateEnum.Abnormal.ToString();
                        stationinfoRepository.Update(item, true);
                        stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
                        continue;
                        //throw new Exception("未找到工单头表！工单号：" + item.Number);
                    }
                    var dt_Geometry_Data = PipelineJob.QueryMateriel(mesinfo.drawingNo);
                    var dt_Geometry_Data1 = PipelineJob.QueryMateriel1(mesinfo.drawingNo);

                    int CompeletedNum = Convert.ToInt32(mesinfo.quantity) - Convert.ToInt32(mesinfo.finishNum);


                    //判定任务是否已创建//如已存在  
                    if (agvtaskRepository.Find(x => x.agv_fromaddress == item.stationCode).Any())
                    var geometry = Pipeline.QueryMateriel(work.drawingNo);
                    if (geometry == null)
                    {
                        item.remark = "未找到车轮信息！";
                        item.location_state = LocationStateEnum.Abnormal.ToString();
                        stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
                        continue;
                    }

                    dt_stationinfo TargetLocation = null;
                    string tasktype = "";
                    if (item.quantity == 5 || CompeletedNum == 0)  //循环读取车轮数为5或者订单已完成数量的下料口    â†’工单人工关闭的工单

                    //if (item.quantity == 5)
                    if (item.quantity == geometry.stackNoRange)
                    {


                        if (mesinfo.quantity <= 50 || item.stationCode.Contains("3"))    //小于50件直接出库
                        {
                            //todo å¯»æ‰¾å¯æ”¾è´§å¤–协放货台
                        if (!string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
                            tasktype = "TaskType_OutsourceInbound";
                            TargetLocation = GetEmptyLocation(stationinfoRepository);
                            #region MyRegion
                            //if (TargetLocation != null)
                            //{
                            //    dt_agvtask agvtask = new dt_agvtask()
                            //    {
                            //        agv_fromaddress = item.stationCode,
                            //        agv_id = Guid.NewGuid(),
                            //        agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
                            //        agv_grade = 1,
                            //        agv_createtime = DateTime.Now,
                            //        agv_taskstate = "Create",
                            //        agv_materielid = item.stationType,
                            //        agv_qty = item.quantity,
                            //        agv_tasktype = "TaskType_OutsourceInbound",
                            //        agv_toaddress = TargetLocation.stationCode,
                            //        agv_userid = "系统",
                            //        bindSN = item.bindSN,
                            //        agv_worktype = Convert.ToInt32(mesinfo.processCode),
                            //        agv_materbarcode = mesinfo.materialCode,
                            //        agv_Traytype = item.tray_type,
                            //        jobID = item.Number,
                            //        agv_TrayStatus = item.tray_status
                            //    };

                            //    agvtaskRepository.Add(agvtask, true);
                            //    TargetLocation.location_state = LocationStateEnum.Busy.ToString();
                            //    TargetLocation.stationType = agvtask.agv_materielid;
                            //    stationinfoRepository.Update(TargetLocation, true);
                            //}
                            #endregion

                        }
                        else
                        {
                            //todo:  è°ƒç”¨WMS接口创建任务
                            tasktype = "TaskType_Inbound";
                            TargetLocation = GetEmptyLocation(stationinfoRepository, mesinfo, item, CompeletedNum, dt_Geometry_Data == null ? dt_Geometry_Data1.e : dt_Geometry_Data.e);
                        }
                        if (TargetLocation != null)
                        {
                            dt_agvtask agvtask = new dt_agvtask()
                            {
                                agv_fromaddress = item.stationCode,
                                agv_id = Guid.NewGuid(),
                                agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
                                agv_grade = 1,
                                agv_createtime = DateTime.Now,
                                agv_taskstate = "Create",
                                agv_materielid = item.stationType,
                                agv_qty = item.quantity,
                                agv_tasktype = tasktype,
                                agv_toaddress = TargetLocation.stationCode,
                                agv_userid = "系统",
                                bindSN = item.bindSN,
                                agv_worktype = Convert.ToInt32(mesinfo.processCode),
                                agv_materbarcode = mesinfo.materialCode,
                                agv_Traytype = item.tray_type,
                                jobID = item.Number,
                                agv_TrayStatus = item.tray_status
                            };
                            agvtaskRepository.Add(agvtask, true);

                            item.location_state = LocationStateEnum.InBusy.ToString();
                            stationinfoRepository.Update(item, true);

                            TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
                            TargetLocation.stationType = agvtask.agv_materielid;
                            stationinfoRepository.Update(TargetLocation, true);
                            WriteDBLog.Success("创建入库任务", $"任务编号：{agvtask.agv_tasknum}", "PCS");
                        }
                        AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, item, tasktype, work);
                    }
                }
            }
@@ -156,7 +90,6 @@
            {
                WriteDBLog.Error("创建入库任务", $"错误信息： {ex.Message}", "PCS");
            }

        }

        /// <summary>
@@ -172,8 +105,10 @@
            dt_stationinfo TargetLocation = null;

            #region åŒç±»åž‹æ”¾ä¸€è¡Œ
            var area1 = GetArea(mesinfo.quantity, e);
            TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo && x.area == area1).OrderByDescending(x => x.line).OrderBy(x => x.column).FirstOrDefault();
            //if (area1 == "1")
            TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo).FirstOrDefault();

            //TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo && x.area == area1).OrderByDescending(x => x.line).OrderBy(x => x.column).FirstOrDefault();
            if (TargetLocation != null)
            {
                #region åŒä¸€è¡Œåªå…è®¸ä¸€ä¸ªä»»åŠ¡
@@ -182,14 +117,33 @@
                //    return null;
                #endregion

                #region å‡ºåº“任务优先,存在出库任务这一行则不能入库
                var OutTask = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == area1 && x.location_state == LocationStateEnum.OutBusy.ToString()).Any();
                if (OutTask) return null;
                #region å‡ºåº“任务优先,存在出库任务则不能入库
                bool OutTask = false;
                if (TargetLocation.area == "1")
                {
                    TargetLocation = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderByDescending(x => x.line).FirstOrDefault();
                    if (TargetLocation != null)
                        OutTask = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.OutBusy.ToString()).Any();
                    if (OutTask)//这列存在出库任务,寻找一列空货位
                        TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.column).FirstOrDefault();
                    if (TargetLocation != null) return TargetLocation;
                }
                else
                {
                    TargetLocation = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.column).FirstOrDefault();
                    if (TargetLocation != null)
                        OutTask = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.location_state == LocationStateEnum.OutBusy.ToString()).Any();
                    //库内存在出库任务，重新开一行入库
                    if (OutTask)
                        TargetLocation = stationinfoRepository.Find(x => x.column == (TargetLocation.area == "2" ? 1 : 10) && x.area == TargetLocation.area && x.enable && x.location_state == LocationStateEnum.Empty.ToString()).OrderBy(x => x.line).FirstOrDefault();
                    if (TargetLocation != null) return TargetLocation;
                }

                #endregion

                TargetLocation = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == area1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.column).FirstOrDefault();
                if (TargetLocation != null)
                    return TargetLocation;
                //TargetLocation = stationinfoRepository.Find(x => x.line == TargetLocation.line && x.area == TargetLocation.area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.column).FirstOrDefault();
                //if (TargetLocation != null)
                //    return TargetLocation;
            }
            #endregion

@@ -279,15 +233,19 @@
                stationinfoRepository.Update(stationinfo, true);
                return null;
            }

            #region æŸ¥æ‰¾åº“å­˜
            dt_inventory inventory = null;
            if (detail.heatID != null)
            {
                inventory = inventoryRepository.Find(x => /*x.HeatNumber == detail.heatID &&*/ x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).FirstOrDefault();
                inventory = inventoryRepository.Find(x => /*x.HeatNumber == detail.heatID &&*/ x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).OrderByDescending(x => x.OnlineTime).FirstOrDefault();
            }
            else
            {
                inventory = inventoryRepository.Find(x => x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).FirstOrDefault();
                inventory = inventoryRepository.Find(x => x.FigureNumber == mesinfo.drawingNo /*&& x.jobID == mesinfo.jobID*/).OrderByDescending(x => x.OnlineTime).FirstOrDefault();
            }
            #endregion


            #region æ ¹æ®åº“存查找可入库空货位
            if (inventory != null)
@@ -307,8 +265,9 @@



            var area1 = string.IsNullOrEmpty(mesinfo.area) ? GetArea(mesinfo.quantity, e) : mesinfo.area;

            if (CompeletedNum <= 15)
            if (CompeletedNum <= 15 || area1 == "1")
            {
                TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).FirstOrDefault();
            }
@@ -319,17 +278,31 @@
                //else if (180 < mesinfo.quantity && mesinfo.quantity <= 225 && e < 1100)
                //    TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == "3" && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
                //if (50 < mesinfo.quantity && e > 1100 || TargetLocation == null)
                var area = GetArea(mesinfo.quantity, e);

                //var area = GetArea(mesinfo.quantity, e);


                TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
                TargetLocation = stationinfoRepository.Find(x => x.column == (area1 == "2" ? 1 : 10) && x.area == area1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
                if (TargetLocation == null)
                {
                    if (area == "2")
                        area = "3";
                    else if (area == "3")
                        area = "2";
                    TargetLocation = stationinfoRepository.Find(x => x.column == 1 && x.area == area && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).FirstOrDefault();
                    if (area1 == "2")
                        area1 = "3";
                    else if (area1 == "3")
                        area1 = "2";
                    TargetLocation = stationinfoRepository.Find(x => x.column == (area1 == "2" ? 1 : 10) && x.area == area1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
                    if (TargetLocation == null)
                    {
                        //TargetLocation = stationinfoRepository.Find(x => x.stationType == mesinfo.drawingNo && x.area == "1").OrderByDescending(x => x.column).FirstOrDefault();

                        //if (TargetLocation != null)
                        //    TargetLocation = stationinfoRepository.Find(x => x.column == TargetLocation.column && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderByDescending(x => x.line).FirstOrDefault();
                        //if (TargetLocation == null)
                        //    TargetLocation = stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).OrderByDescending(x => x.line).FirstOrDefault();
                        if (TargetLocation == null)
                            TargetLocation = stationinfoRepository.Find(x => x.line == 2 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "1").OrderBy(x => x.column).FirstOrDefault();

                    }

                }

                //if (TargetLocation == null)
@@ -368,7 +341,21 @@
            }
            return TargetLocation;
        }

        /// <summary>
        /// ä¸´æ—¶ä½¿ç”¨
        /// </summary>
        /// <param name="stationinfoRepository"></param>
        /// <returns></returns>
        public static dt_stationinfo GetEmptyLocation1(Idt_stationinfoRepository stationinfoRepository)
        {
            return stationinfoRepository.Find(x => x.line == 1 && x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "3").OrderBy(x => x.column).FirstOrDefault();//行和区域需写死
        }
        /// <summary>
        /// åŽ»å¤–协
        /// </summary>
        /// <param name="stationinfoRepository"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public static dt_stationinfo GetEmptyLocation(Idt_stationinfoRepository stationinfoRepository)
        {
            dt_stationinfo TargetLocation = null;
@@ -378,17 +365,17 @@
            if (!Pipeline_client.IsConnected) throw new Exception("与链条机连接超时！");
            foreach (var item in target)
            {
                TargetLocation = stationinfoRepository.Find(x => x.stationCode == item && x.location_state == "Empty" /*LocationStateEnum.Empty.ToString()*/ && x.enable).FirstOrDefault();
                TargetLocation = stationinfoRepository.Find(x => x.stationCode == item && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).FirstOrDefault();

                var PalletSignal = Pipeline_client.ReadByOrder<Int16>("R_PalletSignal", item);//读取托盘信号:1:有,2无
                var MaterialSignal = Pipeline_client.ReadByOrder<Int16>("R_MaterialSignal", item);//读取货物信号:1:有,2无
                if (TargetLocation != null && PalletSignal == 2 && MaterialSignal == 2) return TargetLocation;
            }

            if (TargetLocation == null)
            {
                throw new Exception("外协入库口已满");
            }
            //if (TargetLocation == null)
            //{
            //    throw new Exception("外协入库口已满");
            //}
            return TargetLocation;
        }
        /// <summary>