辊分下空筒、涂布上空筒，涂布缓存架存放空筒

wangxinhui

2026-03-24 0187d7d752ee493b3691432a24cf97ededda2530

辊分下空筒、涂布上空筒，涂布缓存架存放空筒

 wcs-server-hbf/WIDESEA_WCS/Jobs/AGV/JobF_0925.cs

@@ -32,10 +32,10 @@
                                WriteLog.GetLog().Write($"开始时间负极：{DateTime.Now} --------------", $"负极调度");
                                StackerExecutor.F_BCK_Task();//负极箔材

                                StackerExecutor.F_GFSB_UpTask();//负极辊分上料任务
                                StackerExecutor.F_GFSB_UpTask();//负极辊分上料任务/辊分下空筒
                                StackerExecutor.F_GFSB_DownTask();//负极辊分下料任务

                                StackerExecutor.F_TBSB_DownTask(); //负极涂布下料任务
                                StackerExecutor.F_TBSB_DownTask(); //负极涂布下料任务/涂布上空筒
                                StackerExecutor.F_TBSB_UpTask();//负极涂布上料任务

                                StackerExecutor.F_TSJ_DownTask();//负极提升机下料任务

 wcs-server-hbf/WIDESEA_WCS/Jobs/AGV/JobZ_0925.cs

@@ -33,9 +33,9 @@
                                StackerExecutor.Z_BCK_Task();//正极箔材库

                                StackerExecutor.Z_GFSB_DownTask();//正极辊分下料任务
                                StackerExecutor.Z_GFSB_UpTask(); //正极辊分上料任务
                                StackerExecutor.Z_GFSB_UpTask(); //正极辊分上料任务/辊分下空筒

                                StackerExecutor.Z_TBSB_DownTask();//正极涂布下料
                                StackerExecutor.Z_TBSB_DownTask();//正极涂布下料/涂布上空筒
                                StackerExecutor.Z_TBSB_UpTask();//正极涂布上料任务

                                StackerExecutor.Z_TSJ_DownTask();//正极提升机下料

 wcs-server-hbf/WIDESEA_WCS/JobsPart/AGV/UpdateAgvTaskText.cs

@@ -292,7 +292,7 @@
                                    base_ware_location location = locationRepository.FindFirst(x => x.upper_code == agvTask.agv_fromaddress);
                                    if (location != null)
                                    {
                                        if (!agvTask.agv_remark.Contains("切卷上料回空"))
                                        if (!agvTask.agv_remark.Contains("切卷上料回空") && !agvTask.agv_remark.Contains("涂布上空筒任务"))
                                        {
                                            location.geartype = "暂无";
                                        }
@@ -509,7 +509,7 @@
                                    }
                                    else
                                    {
                                        if (!agvTask.agv_remark.Contains("切卷上料呼叫"))
                                        if (!agvTask.agv_remark.Contains("切卷上料呼叫") && !agvTask.agv_remark.Contains("辊分下空筒任务"))
                                        {
                                            location.geartype = "暂无";
                                        }

 wcs-server-hbf/WIDESEA_WCS/SchedulerExecute/Equipment/F_GFSB_UPTask.cs

@@ -51,7 +51,59 @@
                            //当前设备有没有上料请求
                            OperateResult<bool> GYR_RFX = plc.MelsecPLCClient.MelsecMcNetClient.ReadBool("D5493.0");
                            Int16 tf = Convert.ToInt16(GYR_RFX.Content);
                            if (GYR_RFX.Content)
                            OperateResult<Int16> R_Type = plc.MelsecPLCClient.MelsecMcNetClient.ReadInt16("D5424");
                            if (GYR_RFX.Content && R_Type.Content==Convert.ToInt16(2))
                            {
                                //查看当前辊分机设备是否有AGV任务
                                var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == plc.EquipType);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸‹ç©ºç­’请求信号
                                WriteLog.GetLog().Write($"{plc.PLCName}下空筒请求：{GYR_RFX.Content}，{R_Type.Content}---{DateTime.Now}", $"负极棍分下空筒请求");
                                #endregion
                                List<base_routing_table> Routing_Table = routingRepository.Find(d => d.route_end == plc.EquipType);
                                List<string> begans = Routing_Table.Select(x=>x.route_began).ToList();
                                base_ware_location ware_Location = locRepository.Find(d => begans.Contains(d.upper_code) && d.location_state == LoctionStateEnum.LocationState_Empty.ToString() && d.tpgd == 0 && d.area == "FJ-TBHCJ" && d.status == 1 && d.task == 2 && d.geartype == "C").OrderBy(d => d.update_time).FirstOrDefault();

                                if (ware_Location != null)
                                {
                                    base_ware_location Location = ware_Location;
                                    //生成涂布机下料任务
                                    dt_agvtask agvtask = new dt_agvtask()
                                    {
                                        agv_id = Guid.NewGuid(),
                                        agv_tasknum = "KH-" + IdenxManager.GetTaskNo(),
                                        agv_fromaddress = plc.EquipType,//以设备为起点
                                        agv_toaddress = Location.upper_code,
                                        agv_code = "负极AGV调度",
                                        agv_remark = "辊分下空筒任务",
                                        agv_taskstate = AGVTaskStateEnum.Create.ToString(),
                                        agv_tasktype = AGVTaskTypeEnum.TaskType_Outbound.ToString(),
                                        agv_worktype = 1,//工作类型
                                        agv_materielid = "",
                                        agv_qty = 1,
                                        agv_createtime = DateTime.Now,
                                        agv_grade = 0,//任务优先级
                                        agv_userid = "WCS",
                                        agv_barcode = "",
                                    };

                                    //Location.update_time = DateTime.Now;
                                    Location.update_time = DateTime.Now;
                                    Location.task = 1;
                                    var entry = locRepository.DbContext.ChangeTracker.Entries<base_ware_location>().FirstOrDefault();
                                    if (entry != null)
                                    {
                                        entry.State = EntityState.Detached;
                                    }
                                    int a = locRepository.Update(Location, d => new { d.task, d.update_time }, true);
                                    if (a == 1)
                                    {
                                        agvRepository.Add(agvtask, true);
                                    }
                                }
                            }
                            else if(GYR_RFX.Content)
                            {
                                //查看当前辊分机设备是否有AGV任务
                                var SBtask = agvRepository.FindFirst(f => f.agv_toaddress == plc.EquipType);
@@ -64,7 +116,7 @@
                                List<base_ware_location> loctionList = new List<base_ware_location>();
                                foreach (var item in Routing_Table)
                                {
                                    base_ware_location ware_Locations = locRepository.FindFirst(d => d.upper_code == item.route_began && d.status == 1 && d.location_state == LoctionStateEnum.LocationState_Stored.ToString() && d.logic_col == 1 && d.task == 2);
                                    base_ware_location ware_Locations = locRepository.FindFirst(d => d.upper_code == item.route_began && d.status == 1 && d.location_state == LoctionStateEnum.LocationState_Stored.ToString() && d.logic_col == 1 && d.task == 2 && d.geartype == "暂无");
                                    if (ware_Locations == null)
                                    {
                                        continue;

 wcs-server-hbf/WIDESEA_WCS/SchedulerExecute/Equipment/F_TBSB_DownTask.cs

@@ -51,15 +51,79 @@
                                continue;
                            }
                            string SB_Up_Location = "FJXL-TBSB" + TBSB.Replace("涂布机负极", "");//拼接涂布下料口
                                                                                            //查看当前涂布机设备是否有AGV任务
                            var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == SB_Up_Location);
                            //有结束本次循环
                            if (SBtask != null) { continue; }
                            //当前设备有没有上料请求
                            bool GYR_RFX = plc.OmronPLCClient.OmronFinsNetClient.ReadBool("D11293.00").Content;
                            Int16 R_Type = plc.OmronPLCClient.OmronFinsNetClient.ReadInt16("D11224").Content;
                            //Convert.ToBoolean(plc.ReadValue("R_Feedingrequest".ToString(), SB_Up_Location));
                            if (GYR_RFX)
                            if (GYR_RFX && R_Type == Convert.ToInt16(1))
                            {
                                var SBtask = agvRepository.FindFirst(f => f.agv_toaddress == SB_Up_Location);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸Šç©ºç­’请求信号
                                WriteLog.GetLog().Write($"{plc.PLCName}上空筒请求：{GYR_RFX}，{R_Type}---{DateTime.Now}", $"负极涂布上空筒请求");
                                #endregion
                                //找到路由规则(以设备为起点的路由规则)
                                List<base_routing_table> Routing_Table = routingRepository.Find(d => d.route_began == SB_Up_Location);
                                List<string> ends = Routing_Table.Select(x => x.route_end).ToList();
                                if (Routing_Table.Count > 0)
                                {
                                    //可用空筒缓存架
                                    base_ware_location location_TB = locRepository.Find(t => ends.Contains(t.upper_code) && t.location_state == LoctionStateEnum.LocationState_Stored.ToString() && t.tpgd == 1 && t.area == "FJ-TBHCJ" && t.status == 1 && t.task == 2 && t.geartype == "C").OrderBy(d => d.update_time).FirstOrDefault();
                                    if (location_TB != null)
                                    {
                                        WebResponseContent content = new WebResponseContent();
                                        locRepository.DbContextBeginTransaction(() =>
                                        {
                                            //生成涂布机下料任务
                                            dt_agvtask agvtask = new dt_agvtask()
                                            {
                                                agv_id = Guid.NewGuid(),
                                                agv_tasknum = "KH-" + IdenxManager.GetTaskNo(),
                                                agv_fromaddress = location_TB.upper_code,//以设备未起点
                                                agv_toaddress = SB_Up_Location,
                                                agv_code = "负极AGV调度",
                                                agv_remark = "涂布上空筒任务",
                                                agv_taskstate = AGVTaskStateEnum.Create.ToString(),
                                                agv_tasktype = AGVTaskTypeEnum.TaskType_Outbound.ToString(),
                                                agv_worktype = 1,//工作类型
                                                agv_materielid = "",
                                                agv_qty = 1,
                                                agv_createtime = DateTime.Now,
                                                agv_grade = 0,//任务优先级
                                                agv_userid = "WCS",
                                                agv_barcode = "",
                                            };

                                            location_TB.update_time = DateTime.Now;
                                            location_TB.task = 1;
                                            var entry = locRepository.DbContext.ChangeTracker.Entries<base_ware_location>().FirstOrDefault();
                                            if (entry != null)
                                            {
                                                entry.State = EntityState.Detached;
                                            }
                                            int x = locRepository.Update(location_TB, d => new { d.update_time, d.task }, true);
                                            if (x == 1)
                                            {
                                                agvRepository.Add(agvtask, true);
                                                //WriteDBLog.Info($"【{TBSB}】下料任务生成").Write($"生成任务:{agvtask.agv_tasknum},终点货位【{location_TB.upper_code}】状态：托盘光电检测：{location_TB.tpgd},状态：{location_TB.location_state},更新时间：{location_TB.wireless_time}", $"【{TBSB}】下料任务生成");
                                                //WriteDBLog.Info($"【{TBSB}】下料任务生成").Write($"----------------任务生成成功  {DateTime.Now} -------------- {Environment.NewLine}", $"【{TBSB}】下料任务生成");
                                                return content.OK();
                                            }
                                            else
                                            {
                                                return content.Error();
                                            }
                                        });
                                    }

                                }
                            }
                            else if (GYR_RFX)
                            {
                                var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == SB_Up_Location);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸‹æ–™è¯·æ±‚信号
                                WriteLog.GetLog().Write($"{plc.PLCName}下料请求：{GYR_RFX}---{DateTime.Now}", $"负极涂布下料请求");
                                #endregion
@@ -72,7 +136,7 @@
                                    foreach (var item in Routing_Table)
                                    {
                                        //找先找涂布区域缓存架
                                        location_TB = locRepository.FindFirst(t => t.upper_code == item.route_end && t.location_state == LoctionStateEnum.LocationState_Empty.ToString() && t.area == "FJ-TBHCJ" && t.status == 1 && t.task == 2);
                                        location_TB = locRepository.FindFirst(t => t.upper_code == item.route_end && t.location_state == LoctionStateEnum.LocationState_Empty.ToString() && t.area == "FJ-TBHCJ" && t.status == 1 && t.task == 2 && t.geartype == "暂无");
                                        if (location_TB != null)
                                        {
                                            // location = location_TB.FirstOrDefault();//如果找到，赋值后退出循环

 wcs-server-hbf/WIDESEA_WCS/SchedulerExecute/Equipment/Z_GFSB_UPTask.cs

@@ -53,7 +53,59 @@

                            OperateResult<bool> GYR_RFX = plc.MelsecPLCClient.MelsecMcNetClient.ReadBool("D5493.0");
                            Int16 tf = Convert.ToInt16(GYR_RFX.Content);
                            if (GYR_RFX.Content)
                            OperateResult<Int16> R_Type = plc.MelsecPLCClient.MelsecMcNetClient.ReadInt16("D5424");
                            if (GYR_RFX.Content && R_Type.Content == Convert.ToInt16(2))
                            {
                                //查看当前辊分机设备是否有AGV任务
                                var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == plc.EquipType);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸‹ç©ºç­’请求信号
                                WriteLog.GetLog().Write($"{plc.PLCName}下空筒请求：{GYR_RFX.Content}，{R_Type.Content}---{DateTime.Now}", $"正极棍分下空筒请求");
                                #endregion
                                List<base_routing_table> Routing_Table = routingRepository.Find(d => d.route_end == plc.EquipType);
                                List<string> begans = Routing_Table.Select(x => x.route_began).ToList();
                                base_ware_location ware_Location = locRepository.Find(d => begans.Contains(d.upper_code) && d.location_state == LoctionStateEnum.LocationState_Empty.ToString() && d.tpgd == 0 && d.area == "ZJ-TBHCJ" && d.status == 1 && d.task == 2 && d.geartype == "C").OrderBy(d => d.update_time).FirstOrDefault();

                                if (ware_Location != null)
                                {
                                    base_ware_location Location = ware_Location;
                                    //生成涂布机下料任务
                                    dt_agvtask agvtask = new dt_agvtask()
                                    {
                                        agv_id = Guid.NewGuid(),
                                        agv_tasknum = "KH-" + IdenxManager.GetTaskNo(),
                                        agv_fromaddress = plc.EquipType,//以设备为起点
                                        agv_toaddress = Location.upper_code,
                                        agv_code = "正极AGV调度",
                                        agv_remark = "辊分下空筒任务",
                                        agv_taskstate = AGVTaskStateEnum.Create.ToString(),
                                        agv_tasktype = AGVTaskTypeEnum.TaskType_Outbound.ToString(),
                                        agv_worktype = 1,//工作类型
                                        agv_materielid = "",
                                        agv_qty = 1,
                                        agv_createtime = DateTime.Now,
                                        agv_grade = 0,//任务优先级
                                        agv_userid = "WCS",
                                        agv_barcode = "",
                                    };

                                    //Location.update_time = DateTime.Now;
                                    Location.update_time = DateTime.Now;
                                    Location.task = 1;
                                    var entry = locRepository.DbContext.ChangeTracker.Entries<base_ware_location>().FirstOrDefault();
                                    if (entry != null)
                                    {
                                        entry.State = EntityState.Detached;
                                    }
                                    int a = locRepository.Update(Location, d => new { d.task, d.update_time }, true);
                                    if (a == 1)
                                    {
                                        agvRepository.Add(agvtask, true);
                                    }
                                }
                            }
                            else if (GYR_RFX.Content)
                            {
                                //查看当前辊分机设备是否有AGV任务
                                var SBtask = agvRepository.FindFirst(f => f.agv_toaddress == plc.EquipType);
@@ -66,7 +118,7 @@
                                List<base_ware_location> loctionList = new List<base_ware_location>();
                                foreach (var item in Routing_Table)
                                {
                                    base_ware_location ware_Locations = locRepository.FindFirst(d => d.upper_code == item.route_began && d.status == 1 && d.location_state == LoctionStateEnum.LocationState_Stored.ToString() && d.logic_col == 1 && d.task == 2);
                                    base_ware_location ware_Locations = locRepository.FindFirst(d => d.upper_code == item.route_began && d.status == 1 && d.location_state == LoctionStateEnum.LocationState_Stored.ToString() && d.logic_col == 1 && d.task == 2 && d.geartype == "暂无");
                                    if (ware_Locations == null)
                                    {
                                        continue;

 wcs-server-hbf/WIDESEA_WCS/SchedulerExecute/Equipment/Z_TBSB_DownTask.cs

@@ -54,15 +54,80 @@
                            }

                            string SB_Up_Location = "ZJXL-TBSB" + TBSB.Replace("涂布机正极", "");//拼接涂布下料口
                                                                                            //查看当前涂布机设备是否有AGV任务
                            var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == SB_Up_Location);
                            //有结束本次循环
                            if (SBtask != null) { continue; }
                            //当前设备有没有下料请求
                            bool GYR_RFX = plc.OmronPLCClient.OmronFinsNetClient.ReadBool("D11293.00").Content;
                            Int16 R_Type = plc.OmronPLCClient.OmronFinsNetClient.ReadInt16("D11224").Content;
                            WriteLog.GetLog().Write($"{plc.PLCName}请求类型：{R_Type}---{DateTime.Now}", $"正极涂布请求类型");
                            //Convert.ToBoolean(plc.ReadValue("R_Feedingrequest".ToString(), SB_Up_Location));
                            if (GYR_RFX)
                            if (GYR_RFX && R_Type == Convert.ToInt16(1))
                            {
                                var SBtask = agvRepository.FindFirst(f => f.agv_toaddress == SB_Up_Location);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸Šç©ºç­’请求信号
                                WriteLog.GetLog().Write($"{plc.PLCName}上空筒请求：{GYR_RFX}，{R_Type}---{DateTime.Now}", $"正极涂布上空筒请求");
                                #endregion
                                //找到路由规则(以设备为起点的路由规则)
                                List<base_routing_table> Routing_Table = routingRepository.Find(d => d.route_began == SB_Up_Location);
                                List<string> ends = Routing_Table.Select(x => x.route_end).ToList();
                                if (Routing_Table.Count > 0)
                                {
                                    //可用空筒缓存架
                                    base_ware_location location_TB = locRepository.Find(t => ends.Contains(t.upper_code)  && t.location_state == LoctionStateEnum.LocationState_Stored.ToString() && t.tpgd == 1 && t.area == "ZJ-TBHCJ" && t.status == 1 && t.task == 2 && t.geartype == "C").OrderBy(d => d.update_time).FirstOrDefault();
                                    if (location_TB != null)
                                    {
                                        WebResponseContent content = new WebResponseContent();
                                        locRepository.DbContextBeginTransaction(() =>
                                        {
                                            //生成涂布机下料任务
                                            dt_agvtask agvtask = new dt_agvtask()
                                            {
                                                agv_id = Guid.NewGuid(),
                                                agv_tasknum = "KH-" + IdenxManager.GetTaskNo(),
                                                agv_fromaddress = location_TB.upper_code,//以设备未起点
                                                agv_toaddress = SB_Up_Location,
                                                agv_code = "正极AGV调度",
                                                agv_remark = "涂布上空筒任务",
                                                agv_taskstate = AGVTaskStateEnum.Create.ToString(),
                                                agv_tasktype = AGVTaskTypeEnum.TaskType_Outbound.ToString(),
                                                agv_worktype = 1,//工作类型
                                                agv_materielid = "",
                                                agv_qty = 1,
                                                agv_createtime = DateTime.Now,
                                                agv_grade = 0,//任务优先级
                                                agv_userid = "WCS",
                                                agv_barcode = "",
                                            };

                                            location_TB.update_time = DateTime.Now;
                                            location_TB.task = 1;
                                            var entry = locRepository.DbContext.ChangeTracker.Entries<base_ware_location>().FirstOrDefault();
                                            if (entry != null)
                                            {
                                                entry.State = EntityState.Detached;
                                            }
                                            int x = locRepository.Update(location_TB, d => new { d.update_time, d.task }, true);
                                            if (x == 1)
                                            {
                                                agvRepository.Add(agvtask, true);
                                                //WriteDBLog.Info($"【{TBSB}】下料任务生成").Write($"生成任务:{agvtask.agv_tasknum},终点货位【{location_TB.upper_code}】状态：托盘光电检测：{location_TB.tpgd},状态：{location_TB.location_state},更新时间：{location_TB.wireless_time}", $"【{TBSB}】下料任务生成");
                                                //WriteDBLog.Info($"【{TBSB}】下料任务生成").Write($"----------------任务生成成功  {DateTime.Now} -------------- {Environment.NewLine}", $"【{TBSB}】下料任务生成");
                                                return content.OK();
                                            }
                                            else
                                            {
                                                return content.Error();
                                            }
                                        });
                                    }

                                }
                            }
                            else if (GYR_RFX)
                            {
                                var SBtask = agvRepository.FindFirst(f => f.agv_fromaddress == SB_Up_Location);
                                //有结束本次循环
                                if (SBtask != null) { continue; }
                                #region è®°å½•ä¸‹æ–™è¯·æ±‚信号
                                WriteLog.GetLog().Write($"{plc.PLCName}下料请求：{GYR_RFX}---{DateTime.Now}", $"正极涂布下料请求");
                                #endregion
@@ -75,7 +140,7 @@
                                    foreach (var item in Routing_Table)
                                    {
                                        //找先找涂布区域缓存架
                                        location_TB = locRepository.FindFirst(t => t.upper_code == item.route_end && t.location_state == LoctionStateEnum.LocationState_Empty.ToString() && t.tpgd == 0 && t.area == "ZJ-TBHCJ" && t.status == 1 && t.task == 2);
                                        location_TB = locRepository.FindFirst(t => t.upper_code == item.route_end && t.location_state == LoctionStateEnum.LocationState_Empty.ToString() && t.tpgd == 0 && t.area == "ZJ-TBHCJ" && t.status == 1 && t.task == 2 && t.geartype== "暂无");
                                        if (location_TB != null)
                                        {
                                            //location = location_TB.FirstOrDefault();//如果找到，赋值后退出循环

 wcs-server-hbf/WIDESEA_WCSServer/modified_data.json

@@ -1 +1 @@
{"MM":"456","logtime":"2026-03-12"}
{"MM":"456","logtime":"2026-03-20"}

 Í¿²¼¶Ô½ÓµØÖ·.xlsx

Binary files differ

 ¹õ·Ö¶Ô½ÓµØÖ·.png