src/main/java/basAgvMast.sql
New file @@ -0,0 +1,18 @@ -- save basAgvMast record -- mysql insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast/basAgvMast.html', 'basAgvMast管理', null , '2', null , '1'); insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#view', '查询', '', '3', '0', '1'); insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-add', '新增', '', '3', '1', '1'); insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-edit', '编辑', '', '3', '2', '1'); insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-delete', '删除', '', '3', '3', '1'); insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basAgvMast#btn-export', '导出', '', '3', '4', '1'); -- sqlserver insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast/basAgvMast.html', N'basAgvMast管理', null, '2', null, '1'); insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#view', N'查询', '', '3', '0', '1'); insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-add', N'新增', '', '3', '1', '1'); insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-edit', N'编辑', '', '3', '2', '1'); insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-delete', N'删除', '', '3', '3', '1'); insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgvMast#btn-export', N'导出', '', '3', '4', '1'); src/main/java/com/zy/asrs/controller/BasAgvMastController.java
New file @@ -0,0 +1,9 @@ package com.zy.asrs.controller; import com.zy.common.web.BaseController; import org.springframework.web.bind.annotation.*; @RestController public class BasAgvMastController extends BaseController { } src/main/java/com/zy/asrs/entity/BasAgvMast.java
New file @@ -0,0 +1,192 @@ package com.zy.asrs.entity; import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.annotations.TableField; import java.text.SimpleDateFormat; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; import com.core.common.SpringUtils; import com.zy.system.service.UserService; import com.zy.system.entity.User; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; @Data @TableName("asr_bas_agv_mast") public class BasAgvMast implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ @ApiModelProperty(value= "ID") @TableId(value = "task_no", type = IdType.AUTO) private Long id; /** * WMS任务号 */ @ApiModelProperty(value= "WMS任务号") @TableField("task_no") private Integer taskNo; /** * RGV任务号 */ @ApiModelProperty(value= "RGV任务号") private Long timestamp; /** * 源站点 */ @ApiModelProperty(value= "源站点") @TableField("source_sta_no") private Integer sourceStaNo; /** * 目的站点 */ @ApiModelProperty(value= "目的站点") @TableField("sta_no") private Integer staNo; /** * 源库位 */ @ApiModelProperty(value= "源库位") @TableField("source_loc_no") private String sourceLocNo; /** * 目的库位 */ @ApiModelProperty(value= "目的库位") @TableField("loc_no") private String locNo; /** * 优先级 */ @ApiModelProperty(value= "优先级") private Long priority; /** * 楼层 */ @ApiModelProperty(value= "楼层") @TableField("floor_no") private Integer floorNo; /** * 状态 0: 初始 1: 作业中 2: 完成 */ @ApiModelProperty(value= "状态 0: 初始 1: 作业中 2: 完成 ") private Integer status; /** * 异常时间 */ @ApiModelProperty(value= "异常时间") @TableField("error_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date errorTime; /** * 异常信息 */ @ApiModelProperty(value= "异常信息") @TableField("error_memo") private String errorMemo; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date appeTime; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modiTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") private String modiUser; @ApiModelProperty(value= "输送PLCId") @TableField("devp_id") private Integer devpId; @ApiModelProperty(value= "任务类型") @TableField("io_type") private Integer ioType; public BasAgvMast() {} public BasAgvMast(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser) { this.taskNo = taskNo; this.timestamp = timestamp; this.sourceStaNo = sourceStaNo; this.staNo = staNo; this.sourceLocNo = sourceLocNo; this.locNo = locNo; this.priority = priority; this.floorNo = floorNo; this.status = status; this.errorTime = errorTime; this.errorMemo = errorMemo; this.appeTime = appeTime; this.modiTime = modiTime; this.modiUser = modiUser; } // BasAgvMast basAgvMast = new BasAgvMast( // null, // WMS任务号[非空] // null, // RGV任务号 // null, // 源站点 // null, // 目的站点 // null, // 源库位 // null, // 目的库位 // null, // 优先级 // null, // 楼层 // null, // 状态 // null, // 异常时间 // null, // 异常信息 // null, // 添加时间 // null, // 修改时间 // null // 修改人员 // ); public String getStatus$(){ if (null == this.status){ return null; } switch (this.status){ case 0: return "初始"; case 1: return "作业中"; case 2: return "完成"; default: return String.valueOf(this.status); } } } src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
New file @@ -0,0 +1,22 @@ package com.zy.asrs.entity.param; import lombok.Data; /* * Created by Monkey D. Luffy on 2025.09.09 * */ @Data public class AgvTaskAssignmentParam { private String id; public AgvTaskAssignmentParam() {} public AgvTaskAssignmentParam(String id) { this.id = id; } public AgvTaskAssignmentParam(int id) { this.id = String.valueOf(id); } } src/main/java/com/zy/asrs/mapper/BasAgvMastMapper.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.mapper; import com.zy.asrs.entity.BasAgvMast; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface BasAgvMastMapper extends BaseMapper<BasAgvMast> { } src/main/java/com/zy/asrs/service/BasAgvMastService.java
New file @@ -0,0 +1,8 @@ package com.zy.asrs.service; import com.zy.asrs.entity.BasAgvMast; import com.baomidou.mybatisplus.service.IService; public interface BasAgvMastService extends IService<BasAgvMast> { } src/main/java/com/zy/asrs/service/impl/BasAgvMastServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.service.impl; import com.zy.asrs.mapper.BasAgvMastMapper; import com.zy.asrs.entity.BasAgvMast; import com.zy.asrs.service.BasAgvMastService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service("basAgvMastService") public class BasAgvMastServiceImpl extends ServiceImpl<BasAgvMastMapper, BasAgvMast> implements BasAgvMastService { } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -9,6 +9,7 @@ import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.AgvTaskAssignmentParam; import com.zy.asrs.entity.param.ArmOrderAssignmentParam; import com.zy.asrs.entity.param.ArmTaskAssignmentParam; import com.zy.asrs.entity.param.CombParam; @@ -20,6 +21,7 @@ import com.zy.asrs.utils.Utils; import com.zy.asrs.utils.VersionUtils; import com.zy.asrs.utils.core.ReturnT; import com.zy.common.constant.AgvConstant; import com.zy.common.constant.ArmConstant; import com.zy.common.model.LocTypeDto; import com.zy.common.model.MatDto; @@ -105,6 +107,8 @@ private BasRgvMapService basRgvMapService; @Autowired private BasArmService basArmService; @Autowired private BasAgvMastService basAgvMastService; @Autowired private BasArmMastService basArmMastService; @Autowired @@ -491,10 +495,10 @@ if (Cools.isEmpty(staDesc)) { News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo()); staProtocol.setWorkNo(wrkNo++); staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1)); staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue())); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); log.error("输送线下发4："+9989+","+(pickSta.getStaNo().shortValue()-(short)1)); log.error("输送线下发4："+9996+","+(pickSta.getStaNo().shortValue()-(short)1)); //LED LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed()); // led 异常显示 @@ -518,6 +522,14 @@ Date now = new Date(); // 堆垛机站点(目标站) Integer staNo = staDesc.getCrnStn(); if(wrkMast.getSourceStaNo() > 2000){ switch (wrkMast.getCrnNo()){ case 1: staNo = 2004;break; case 2: staNo = 2010;break; case 4: staNo = 2022;break; case 5: staNo = 2028;break; } } // 更新工作档数据状态 wrkMast.setIoTime(now); wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57 @@ -547,7 +559,7 @@ // 更新站点信息 且 下发plc命令 staProtocol.setWorkNo(wrkMast.getWrkNo()); staProtocol.setStaNo((short) 161); staProtocol.setStaNo(wrkMast.getStaNo().shortValue()); devpThread.setPakMk(staProtocol.getSiteId(), false); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); log.error("输送线下发5："+wrkMast.getWrkNo()+","+wrkMast.getStaNo()); @@ -753,14 +765,14 @@ if(crnSlave.getId() == 3 && wrkMast9997 != null){ WrkMast wrkMast107 = wrkMastMapper.selectPakOutStep107(wrkMast9997.getBarcode()); // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档 CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast107.getCrnNo()); CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,3); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) { // 移动中 continue; } // 判断堆垛机状态等待确认 if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast107.getWrkNo().shortValue()) if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo()== 9997 && crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.forkPosType == CrnForkPosType.HOME) { log.info("堆垛机出库完成 - 开始执行"); @@ -799,14 +811,14 @@ if(crnSlave.getId() == 3 && wrkMast9996 != null){ WrkMast wrkMast107 = wrkMastMapper.selectPakOutStep107(wrkMast9996.getBarcode()); // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档 CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast107.getCrnNo()); CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 3); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) { // 移动中 continue; } // 判断堆垛机状态等待确认 if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast107.getWrkNo().shortValue()) if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo() == 9996 && crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.forkPosType == CrnForkPosType.HOME) { log.info("堆垛机出库完成 - 开始执行"); @@ -966,7 +978,13 @@ } } } if(staProtocolIn.getWorkNo() != null &&staProtocolIn.getStaNo() != 4001){ if(staProtocolIn.getWorkNo() != null && staProtocolIn.getStaNo() != 4001){ WrkMast wrkMastCrn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo()); if(wrkMastCrn!=null){ if(wrkMastCrn.getCrnNo() == 3 ){ continue; } } WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo()); WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996); if(wrkMastIn == null){ @@ -1138,62 +1156,69 @@ } else { staProtocol = staProtocol.clone(); } WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9996(9996); if (slave.getId() == 3 && wrkMast9996 != null) { SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId()); StaProtocol staProtocol2 = devpThread1.getStation().get(4001); if (staProtocol2 == null) { News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol2); break; } else { staProtocol2 = staProtocol2.clone(); } BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); if (staDetl == null) { News.error(""+mark+" - 2"+" - 5"+" - 出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo()); break; // continue; } if( staProtocol2.isAutoing() && staProtocol2.isLoading() && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")){ // 堆垛机控制过滤 if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) { // continue; break; } // 已经存在吊车执行任务时，则过滤 if (wrkMastMapper.selectWorking(slave.getId()) != null) { break; // return; } // 1.堆垛机开始移动 CrnCommand crnCommand = new CrnCommand(); crnCommand.setCrnNo(slave.getId()); // 堆垛机编号 crnCommand.setTaskNo((short) 9996); // 工作号 // crnCommand.setAckFinish((short) 0); // 任务完成确认位 crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转 crnCommand.setSourcePosX((short) 9); // 源库位排 crnCommand.setSourcePosY((short) 52); // 源库位列 crnCommand.setSourcePosZ((short) 3); // 源库位层 crnCommand.setDestinationPosX((short) 9); // 目标库位排 crnCommand.setDestinationPosY((short) 52); // 目标库位列 crnCommand.setDestinationPosZ((short) 2); // 目标库位层 // crnCommand.setTraySize(sourceSta.getLocType1() == 2); //库位类型 if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) { News.error("" + mark + " - 2" + " - 13" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand)); } else { // 修改工作档状态 11.生成出库ID => 12.吊车出库中 Date now = new Date(); wrkMast9996.setWrkSts(3L); wrkMast9996.setCrnStrTime(now); wrkMast9996.setModiTime(now); if (wrkMastMapper.updateById(wrkMast9996) == 0) { News.error("" + mark + " - 2" + " - 14" + " - 修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast9996.getWrkNo()); } break; } } } // WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9996(9996); // // if (slave.getId() == 3 && wrkMast9996 != null) { // SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,2); // StaProtocol staProtocol2 = devpThread1.getStation().get(4001); // if (staProtocol2 == null) { // News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol2); // break; // } else { // staProtocol2 = staProtocol2.clone(); // } // BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); // if (staDetl == null) { // News.error(""+mark+" - 2"+" - 5"+" - 出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo()); // break; //// continue; // } // if( staProtocol2.isAutoing() && staProtocol2.isLoading() && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")){ // // 堆垛机控制过滤 // if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) { //// continue; // break; // } // // 已经存在吊车执行任务时，则过滤 // if (wrkMastMapper.selectWorking(slave.getId()) != null) { // break; //// return; // } // // 1.堆垛机开始移动 // CrnCommand crnCommand = new CrnCommand(); // crnCommand.setCrnNo(slave.getId()); // 堆垛机编号 // crnCommand.setTaskNo((short) 9996); // 工作号 //// crnCommand.setAckFinish((short) 0); // 任务完成确认位 // crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转 // crnCommand.setSourcePosX((short) 9); // 源库位排 // crnCommand.setSourcePosY((short) 52); // 源库位列 // crnCommand.setSourcePosZ((short) 3); // 源库位层 // if(wrkMast9996.getStaNo()>2000){ // crnCommand.setDestinationPosX((short) 9); // 目标库位排 // crnCommand.setDestinationPosY((short) 52); // 目标库位列 // crnCommand.setDestinationPosZ((short) 2); // 目标库位层 // }else{ // crnCommand.setDestinationPosX((short) 11); // 目标库位排 // crnCommand.setDestinationPosY((short) 52); // 目标库位列 // crnCommand.setDestinationPosZ((short) 1); // 目标库位层 // } // //// crnCommand.setTraySize(sourceSta.getLocType1() == 2); //库位类型 // if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) { // News.error("" + mark + " - 2" + " - 13" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand)); // } else { // // 修改工作档状态 11.生成出库ID => 12.吊车出库中 // Date now = new Date(); // wrkMast9996.setWrkSts(3L); // wrkMast9996.setCrnStrTime(now); // wrkMast9996.setModiTime(now); // if (wrkMastMapper.updateById(wrkMast9996) == 0) { // News.error("" + mark + " - 2" + " - 14" + " - 修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast9996.getWrkNo()); // } // break; // } // } // } // 查询站点详细信息 BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); if (staDetl == null) { @@ -1339,6 +1364,8 @@ // WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo()); List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo()); WrkMast wrkMast9997 = wrkMastMapper.selectByWrkNo9997(9997); WrkMast wrkMast9996 = wrkMastMapper.selectByWrkNo9997(9996); if (slave.getId() == 3 && wrkMast9997 != null) { SiemensDevpThread devpThread1 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1); @@ -1435,6 +1462,66 @@ wrkMast9997.setModiTime(now); if (wrkMastMapper.updateById(wrkMast9997) == 0) { News.error("" + mark + " - 2" + " - 14" + " - 修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast9997.getWrkNo()); } break; } } } if (slave.getId() == 3 && wrkMast9996 != null) { SiemensDevpThread devpThread2 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2); StaProtocol staProtocol4001 = devpThread2.getStation().get(4001); if (staProtocol4001 == null) { News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol4001); break; } else { staProtocol4001 = staProtocol4001.clone(); } BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); if (staDetl == null) { News.error(""+mark+" - 2"+" - 5"+" - 出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo()); break; // continue; } if(staProtocol4001.isLoading() && staProtocol4001.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")){ // 堆垛机控制过滤 if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) { // continue; break; } // 已经存在吊车执行任务时，则过滤 if (wrkMastMapper.selectWorking(slave.getId()) != null) { break; // return; } // 1.堆垛机开始移动 CrnCommand crnCommand = new CrnCommand(); crnCommand.setCrnNo(slave.getId()); // 堆垛机编号 crnCommand.setTaskNo((short) 9996); // 工作号 // crnCommand.setAckFinish((short) 0); // 任务完成确认位 crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转 crnCommand.setSourcePosX((short) 9); // 源库位排 crnCommand.setSourcePosY((short) 52); // 源库位列 crnCommand.setSourcePosZ((short) 3); // 源库位层 if(wrkMast9996.getStaNo()>2000){ crnCommand.setDestinationPosX((short) 9); // 目标库位排 crnCommand.setDestinationPosY((short) 52); // 目标库位列 crnCommand.setDestinationPosZ((short) 2); // 目标库位层 }else{ crnCommand.setDestinationPosX((short) 11); // 目标库位排 crnCommand.setDestinationPosY((short) 52); // 目标库位列 crnCommand.setDestinationPosZ((short) 1); // 目标库位层 } // crnCommand.setTraySize(sourceSta.getLocType1() == 2); //库位类型 if (!MessageQueue.offer(SlaveType.Crn, wrkMast9996.getCrnNo(), new Task(2, crnCommand))) { News.error("" + mark + " - 2" + " - 13" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast9996.getCrnNo(), JSON.toJSON(crnCommand)); } else { // 修改工作档状态 11.生成出库ID => 12.吊车出库中 Date now = new Date(); wrkMast9996.setWrkSts(12L); wrkMast9996.setCrnStrTime(now); wrkMast9996.setModiTime(now); if (wrkMastMapper.updateById(wrkMast9996) == 0) { News.error("" + mark + " - 2" + " - 14" + " - 修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast9996.getWrkNo()); } break; } @@ -3791,94 +3878,137 @@ /** * 小车出库接驳任务取货下发 */ // public synchronized void rgvRunWrkToCrn(RgvSlave slave, RgvProtocol rgvProtocol,Integer mark){ // for (RgvSlave.RgvStn rgvStn : slave.getRgvOutTStn()) {//rgv出库取货站点 // boolean flag = false; // //遍历rgv入库取货站点 // DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId()); // StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo()); // RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo()); // StaProtocol staProtocol2 = null; // if(rgvStn.getStaNo2()!= null ){ // staProtocol2 = devpThread.getStation().get(rgvStn.getStaNo2()); // if (staProtocol2 == null) { // News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv入库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol); // continue; // } else { // staProtocol2 = staProtocol2.clone(); // } // BasDevp staDetl2 = basDevpService.selectById(rgvStn.getStaNo2()); // if (staDetl2 == null) { // News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>>Rgv站点在数据库不存在, 站点编号={}", rgvStn.getStaNo()); // continue; // } // } // if (staProtocol == null) { // News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv出库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol); // continue; // } else { // staProtocol = staProtocol.clone(); // } // // // 查询站点详细信息 // BasDevp staDetl = basDevpService.selectById(rgvStn.getStaNo()); // if (staDetl == null) { // News.error("" + mark + " - 1" + " - 2" + " - 出库 ===>>Rgv站点在数据库不存在, 站点编号={}", rgvStn.getStaNo()); // continue; // } // // if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 // && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) { // flag = true; // } // if (!flag) { // News.errorNoLog("" + mark + " - 1" + " - 3" + " - Rgv出库取货站信息(以下需要全true):" // + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading() // + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isOutEnable() // + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanouting()); // continue; // } // BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo()); // List<Integer> route = new ArrayList<>(); // switch (rgvProtocol.getRgvNo()){ // case 1: route = RouteUtils.getRouteOne();break; // case 2: route = RouteUtils.getRouteTwo();break; // } // basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //更新小车当前位置站点号 // WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfereToCrn(route, route, Long.valueOf(staProtocol.getWorkNo()));//根据站点工作号和小车工作范围检索任务档 // if( null == wrkMastSta ) { // News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts0, 工作号={}", staProtocol.getWorkNo()); // continue; // } // WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWrkNo( rgvProtocol.getTaskNo1()); // boolean result = false; // if(wrkMastSta1!= null && rgvProtocol.getRgvNo() == 1){ //距离计算 2楼单入库口不需要计算 // result = rgvCalcDistance((int) rgvProtocol.getRgvNo(),wrkMastSta1.getStaEnd(),wrkMastSta.getStaStart());//工位2放货站点，工位1取货站点 // } // if(result){//若小车距离放货点距离近于取货点则跳过取货 true跳过取货/false优先取货 // rgvThread.setPakRgv(false); // continue; // } // wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//若1号工位有任务给2号工位 // wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo()); // boolean sign = false; // sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发 // if (sign){ public synchronized void rgvRunWrkToCrn(RgvSlave slave, RgvProtocol rgvProtocol,Integer mark){ for (RgvSlave.RgvStn rgvStn : slave.getRgvOutTStn()) {//rgv出库取货站点 boolean flag = false; //遍历rgv入库取货站点 DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId()); StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo()); RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo()); BasRgv basRgv = basRgvService.selectById(slave.getId()); if (basRgv == null) { log.error("{}号RGV尚未在数据库进行维护！4", slave.getId()); continue; } StaProtocol staProtocol2 = null; WrkMastSta wrkMastSta3 = null; if(rgvStn.getStaNo2()!= null ){ staProtocol2 = devpThread.getStation().get(rgvStn.getStaNo2()); if (staProtocol2 == null) { News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv入库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol); continue; } else { staProtocol2 = staProtocol2.clone(); } BasDevp staDetl2 = basDevpService.selectById(rgvStn.getStaNo2()); if (staDetl2 == null) { News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>>Rgv站点在数据库不存在, 站点编号={}", rgvStn.getStaNo()); continue; } wrkMastSta3 = wrkMastStaMapper.selectByWrkNo(staProtocol2.getWorkNo()); } if (staProtocol == null) { News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv出库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol); continue; } else { staProtocol = staProtocol.clone(); } // 查询站点详细信息 BasDevp staDetl = basDevpService.selectById(rgvStn.getStaNo()); if (staDetl == null) { News.error("" + mark + " - 1" + " - 2" + " - 出库 ===>>Rgv站点在数据库不存在, 站点编号={}", rgvStn.getStaNo()); continue; } if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) { flag = true; } if (!flag) { News.errorNoLog("" + mark + " - 1" + " - 3" + " - Rgv出库取货站信息(以下需要全true):" + "自动信号" + staProtocol.isAutoing() + "有物信号" + staProtocol.isLoading() + "工作号>0" + staProtocol.getWorkNo() + "可入信号" + staProtocol.isOutEnable() + "能入信号（wms设置）.equals(\"Y\")" + staDetl.getCanouting()); continue; } BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo()); List<Integer> route = new ArrayList<>(); switch (rgvProtocol.getRgvNo()){ case 1: route = RouteUtils.getRouteOne();break; case 2: route = RouteUtils.getRouteTwo();break; } basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //更新小车当前位置站点号 basRgvMapService.updateById(basRgvMap); WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfere(route, route, Long.valueOf(staProtocol.getWorkNo()));//根据站点工作号和小车工作范围检索任务档 if( null == wrkMastSta ) { News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts0, 工作号={}", staProtocol.getWorkNo()); continue; } WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWrkNo( rgvProtocol.getTaskNo1()); if(basRgv.getPakToCrn().equals("0")){ wrkMastSta = wrkMastStaMapper.selectNoInterfereCrn(route, route, Long.valueOf(staProtocol.getWorkNo())); } boolean result = false; if(wrkMastSta1!= null && rgvProtocol.getRgvNo() == 1){ //距离计算 2楼单入库口不需要计算 result = rgvCalcDistance((int) rgvProtocol.getRgvNo(),wrkMastSta1.getStaEnd(),wrkMastSta.getStaStart());//工位2放货站点，工位1取货站点 } if(result){//若小车距离放货点距离近于取货点则跳过取货 true跳过取货/false优先取货 basRgv.setPakRgv("0"); basRgvService.updateById(basRgv); continue; } wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//若1号工位有任务给2号工位 wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo()); boolean sign = false; sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发 if (sign){ if(LEFT_POSITION.contains(wrkMastSta.getStaEnd())){ basRgv.setPakToCrn("0"); basRgvService.updateById(basRgv); if(wrkMastSta3 != null){ if(!LEFT_POSITION.contains(wrkMastSta3.getStaEnd())){ wrkMastSta3 = null;//若接驳第二位不接驳时取消连续取货 } } } if(wrkMastSta3 != null ){ List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart()); if(wrkMastStaPaking.size() < 1){ wrkMastSta3.setMk(1); basRgv.setPakAll("0"); basRgvService.updateById(basRgv); try{ wrkMastStaMapper.updateById(wrkMastSta3); log.error("锁定相隔站点任务"); }catch (Exception e){ log.error("锁定相隔站点任务失败"); } } } basRgv.setPakIn("0"); basRgvService.updateById(basRgv); rgvThread.setPaking(false); // rgvThread.setPakIn(false);//入库不允许 // try{ // wrkMastSta.setWrkSts(1); // wrkMastStaMapper.updateById(wrkMastSta); // log.error("更新小车任务成功"); // }catch (Exception e){ // log.error("更新小车任务失败"); // } // } else { // log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo()); // } // // // } // } try{ wrkMastSta.setWrkSts(1); wrkMastStaMapper.updateById(wrkMastSta); log.error("更新小车任务成功"); }catch (Exception e){ log.error("更新小车任务失败"); } } else { log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo()); } } } /** * 执行小车搬运任务 * @@ -4483,4 +4613,67 @@ response, bool); } /* * agv任务下发 * */ public synchronized void agvTaskAssignment() { try{ List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0)); for (BasAgvMast basAgvMast : basAgvMastList) { if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=3){//3==》出库==>输送线站点==》AGV库位 continue; } try{ // 获取站点信息 SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, basAgvMast.getDevpId()); StaProtocol staProtocol = devpThread.getStation().get(basAgvMast.getSourceStaNo()); if (staProtocol == null || !staProtocol.isLoading()) { continue; } else { staProtocol = staProtocol.clone(); } if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){ AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(); //任务下发 ReturnT<String> result = new PostMesDataUtils().postMesData("AGV任务下发", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam); if (result.getCode()==200){ basAgvMast.setStatus(1); basAgvMastService.updateById(basAgvMast); } else { agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV任务下发失败", "任务号："+basAgvMast.getTaskNo()+"任务信息下发失败！！！", false); } } } catch (Exception e){ log.error("任务号："+basAgvMast.getTaskNo()+"====》AGV任务下发失败"+e.getMessage()); } } }catch (Exception e){ log.error("AGV任务下发失败"+e.getMessage()); } } public void agvTaskAssignmentCallApiLogSave(BasAgvMast basAgvMast ,String tableName, String response, Boolean bool) { ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>() .eq("namespace", "Agv任务下发") .eq("request", "任务号:" + basAgvMast.getTaskNo()) .eq("response", response) .eq("url", tableName) .eq("result", 0) .orderBy("create_time", false) ); if (!Cools.isEmpty(apiLog)){ long parseLong = Long.parseLong(apiLog.getTimestamp()); if (new Date().getTime()-parseLong<5*1000*60){ return; } } apiLogService.save("Agv任务下发", tableName, "null", "127.0.0.1", "任务号:" + basAgvMast.getTaskNo() , response, bool); } } src/main/java/com/zy/common/CodeBuilder.java
@@ -20,7 +20,7 @@ generator.url="localhost:1433;databasename=jshdasrs"; generator.username="sa"; generator.password="sa@123"; generator.table="asr_bas_devp_opt"; generator.table="asr_bas_agv_mast"; generator.packagePath="com.zy.asrs"; generator.build(); } src/main/java/com/zy/common/constant/AgvConstant.java
New file @@ -0,0 +1,15 @@ package com.zy.common.constant; /* * Created by Monkey D. Luffy on 2025.09.09 * */ public class AgvConstant { public static final String AGV_IP = "10.10.10.171"; public static final String AGV_URL = "http://10.10.10.171:7002"; public static final String AGV_ADAPTOR = "adaptor/api/wcs/order";//创建订单 public static final String AGV_WORKSPACE = "adaptor/api/wcs/workspace/ready";//通知工作空间已就绪 } src/main/java/com/zy/core/MainProcess.java
@@ -25,6 +25,7 @@ // 所属线程 private Thread thread; private Thread armThread; private Thread agvThread; // 频率 private int i = 0; private int k = 0; @@ -39,6 +40,9 @@ armThread = new Thread(this::roboticArmDispatch); armThread.start(); agvThread = new Thread(this::agvDispatch); agvThread.start(); } private void crnAndDevRun() { while (!Thread.currentThread().isInterrupted()) { @@ -177,6 +181,26 @@ } } private void agvDispatch() { while (!Thread.currentThread().isInterrupted()) { try { // 间隔 Thread.sleep(400); // 系统运行状态判断 if (!SystemProperties.WCS_RUNNING_STATUS.get()) { continue; } //agv任务下发 mainService.agvTaskAssignment();//0===》1 } catch (Exception e) { e.printStackTrace(); } } } @PreDestroy public void shutDown(){ if (thread != null) thread.interrupt(); src/main/resources/mapper/BasAgvMastMapper.xml
New file @@ -0,0 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zy.asrs.mapper.BasAgvMastMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgvMast"> <result column="id" property="id" /> <result column="task_no" property="taskNo" /> <result column="timestamp" property="timestamp" /> <result column="source_sta_no" property="sourceStaNo" /> <result column="sta_no" property="staNo" /> <result column="source_loc_no" property="sourceLocNo" /> <result column="loc_no" property="locNo" /> <result column="priority" property="priority" /> <result column="floor_no" property="floorNo" /> <result column="status" property="status" /> <result column="error_time" property="errorTime" /> <result column="error_memo" property="errorMemo" /> <result column="appe_time" property="appeTime" /> <result column="modi_time" property="modiTime" /> <result column="modi_user" property="modiUser" /> <result column="devp_id" property="devpId" /> <result column="io_type" property="ioType" /> </resultMap> </mapper> src/main/resources/mapper/WrkMastMapper.xml
@@ -213,7 +213,7 @@ <select id="selectByWrkNo9996" resultMap="BaseResultMap"> select * from asr_wrk_mast where wrk_no = #{wrkNo} and wrk_sts = 2 and wrk_sts = 11 </select> <select id="selectByWrkNo9997" resultMap="BaseResultMap"> select * from asr_wrk_mast src/main/webapp/static/js/basAgvMast/basAgvMast.js
New file @@ -0,0 +1,274 @@ var pageCurr; layui.config({ base: baseUrl + "/static/layui/lay/modules/" }).use(['table','laydate', 'form', 'admin'], function(){ var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var layDate = layui.laydate; var form = layui.form; var admin = layui.admin; // 数据渲染 tableIns = table.render({ elem: '#basAgvMast', headers: {token: localStorage.getItem('token')}, url: baseUrl+'/basAgvMast/list/auth', page: true, limit: 15, limits: [15, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, height: 'full-120', cols: [[ {type: 'checkbox'} ,{field: 'id', align: 'center',title: 'ID'} ,{field: 'taskNo', align: 'center',title: 'WMS任务号'} ,{field: 'timestamp', align: 'center',title: 'RGV任务号'} ,{field: 'sourceStaNo', align: 'center',title: '源站点'} ,{field: 'staNo', align: 'center',title: '目的站点'} ,{field: 'sourceLocNo', align: 'center',title: '源库位'} ,{field: 'locNo', align: 'center',title: '目的库位'} ,{field: 'priority', align: 'center',title: '优先级'} ,{field: 'floorNo', align: 'center',title: '楼层'} ,{field: 'status$', align: 'center',title: '状态'} ,{field: 'errorTime$', align: 'center',title: '异常时间'} ,{field: 'errorMemo', align: 'center',title: '异常信息'} ,{field: 'appeTime$', align: 'center',title: '添加时间'} ,{field: 'modiTime$', align: 'center',title: '修改时间'} ,{field: 'modiUser$', align: 'center',title: '修改人员'} ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120} ]], request: { pageName: 'curr', pageSize: 'limit' }, parseData: function (res) { return { 'code': res.code, 'msg': res.msg, 'count': res.data.total, 'data': res.data.records } }, response: { statusCode: 200 }, done: function(res, curr, count) { if (res.code === 403) { top.location.href = baseUrl+"/"; } pageCurr=curr; limit(); } }); // 监听排序事件 table.on('sort(basAgvMast)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); searchData['orderByField'] = obj.field; searchData['orderByType'] = obj.type; tableIns.reload({ where: searchData, page: {curr: 1} }); }); // 监听头工具栏事件 table.on('toolbar(basAgvMast)', function (obj) { var checkStatus = table.checkStatus(obj.config.id).data; switch(obj.event) { case 'addData': showEditModel(); break; case 'deleteData': if (checkStatus.length === 0) { layer.msg('请选择要删除的数据', {icon: 2}); return; } del(checkStatus.map(function (d) { return d.id; })); break; case 'exportData': admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){ var titles=[]; var fields=[]; obj.config.cols[0].map(function (col) { if (col.type === 'normal' && col.hide === false && col.toolbar == null) { titles.push(col.title); fields.push(col.field); } }); var exportData = {}; $.each($('#search-box [name]').serializeArray(), function() { exportData[this.name] = this.value; }); var param = { 'basAgvMast': exportData, 'fields': fields }; $.ajax({ url: baseUrl+"/basAgvMast/export/auth", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(param), dataType:'json', contentType:'application/json;charset=UTF-8', method: 'POST', success: function (res) { layer.closeAll(); if (res.code === 200) { table.exportFile(titles,res.data,'xls'); } else if (res.code === 403) { top.location.href = baseUrl+"/"; } else { layer.msg(res.msg, {icon: 2}) } } }); }); break; } }); // 监听行工具事件 table.on('tool(basAgvMast)', function(obj){ var data = obj.data; switch (obj.event) { case 'edit': showEditModel(data); break; case "del": del([data.id]); break; } }); /* 弹窗 - 新增、修改 */ function showEditModel(mData) { admin.open({ type: 1, area: '600px', title: (mData ? '修改' : '添加') + '订单状态', content: $('#editDialog').html(), success: function (layero, dIndex) { layDateRender(mData); form.val('detail', mData); form.on('submit(editSubmit)', function (data) { var loadIndex = layer.load(2); $.ajax({ url: baseUrl+"/basAgvMast/"+(mData?'update':'add')+"/auth", headers: {'token': localStorage.getItem('token')}, data: data.field, method: 'POST', success: function (res) { layer.close(loadIndex); if (res.code === 200){ layer.close(dIndex); layer.msg(res.msg, {icon: 1}); tableReload(); } else if (res.code === 403){ top.location.href = baseUrl+"/"; }else { layer.msg(res.msg, {icon: 2}); } } }) return false; }); $(layero).children('.layui-layer-content').css('overflow', 'visible'); layui.form.render('select'); } }); } /* 删除 */ function del(ids) { layer.confirm('确定要删除选中数据吗？', { skin: 'layui-layer-admin', shade: .1 }, function (i) { layer.close(i); var loadIndex = layer.load(2); $.ajax({ url: baseUrl+"/basAgvMast/delete/auth", headers: {'token': localStorage.getItem('token')}, data: {ids: ids}, method: 'POST', success: function (res) { layer.close(loadIndex); if (res.code === 200){ layer.msg(res.msg, {icon: 1}); tableReload(); } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { layer.msg(res.msg, {icon: 2}); } } }) }); } // 搜索 form.on('submit(search)', function (data) { pageCurr = 1; tableReload(false); }); // 重置 form.on('submit(reset)', function (data) { pageCurr = 1; clearFormVal($('#search-box')); tableReload(false); }); // 时间选择器 function layDateRender(data) { setTimeout(function () { layDate.render({ elem: '.layui-laydate-range' ,type: 'datetime' ,range: true }); layDate.render({ elem: '#errorTime\\$', type: 'datetime', value: data!==undefined?data['errorTime\\$']:null }); layDate.render({ elem: '#appeTime\\$', type: 'datetime', value: data!==undefined?data['appeTime\\$']:null }); layDate.render({ elem: '#modiTime\\$', type: 'datetime', value: data!==undefined?data['modiTime\\$']:null }); }, 300); } layDateRender(); }); // 关闭动作 $(document).on('click','#data-detail-close', function () { parent.layer.closeAll(); }); function tableReload(child) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); tableIns.reload({ where: searchData, page: {curr: pageCurr} }); } src/main/webapp/views/basAgvMast/basAgvMast.html
New file @@ -0,0 +1,181 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> <title></title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> <link rel="stylesheet" href="../../static/css/cool.css" media="all"> </head> <body> <div class="layui-fluid"> <div class="layui-card"> <div class="layui-card-body"> <div class="layui-form toolbar" id="search-box"> <div class="layui-form-item"> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off"> </div> </div> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off"> </div> </div> <div class="layui-inline">  <button class="layui-btn icon-btn" lay-filter="search" lay-submit> <i class="layui-icon"></i>搜索 </button> <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> <i class="layui-icon"></i>重置 </button> </div> </div> </div> <table class="layui-hide" id="basAgvMast" lay-filter="basAgvMast"></table> </div> </div> </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button> </div> </script> <script type="text/html" id="operate"> <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a> </script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/basAgvMast/basAgvMast.js" charset="utf-8"></script> </body> <!-- 表单弹窗 --> <script type="text/html" id="editDialog"> <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> <input name="id" type="hidden"> <div class="layui-row"> <div class="layui-col-md12"> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">WMS任务号: </label> <div class="layui-input-block"> <input class="layui-input" name="taskNo" placeholder="请输入WMS任务号" lay-vertype="tips" lay-verify="required"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">RGV任务号: </label> <div class="layui-input-block"> <input class="layui-input" name="timestamp" placeholder="请输入RGV任务号"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">源站点: </label> <div class="layui-input-block"> <input class="layui-input" name="sourceStaNo" placeholder="请输入源站点"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">目的站点: </label> <div class="layui-input-block"> <input class="layui-input" name="staNo" placeholder="请输入目的站点"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">源库位: </label> <div class="layui-input-block"> <input class="layui-input" name="sourceLocNo" placeholder="请输入源库位"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">目的库位: </label> <div class="layui-input-block"> <input class="layui-input" name="locNo" placeholder="请输入目的库位"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">优先级: </label> <div class="layui-input-block"> <input class="layui-input" name="priority" placeholder="请输入优先级"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">楼层: </label> <div class="layui-input-block"> <input class="layui-input" name="floorNo" placeholder="请输入楼层"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">状态: </label> <div class="layui-input-block"> <select name="status"> <option value="">请选择状态</option> <option value="0">初始</option> <option value="1">作业中</option> <option value="2">完成</option> </select> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">异常时间: </label> <div class="layui-input-block"> <input class="layui-input" name="errorTime" id="errorTime$" placeholder="请输入异常时间"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">异常信息: </label> <div class="layui-input-block"> <input class="layui-input" name="errorMemo" placeholder="请输入异常信息"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">添加时间: </label> <div class="layui-input-block"> <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入添加时间"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">修改时间: </label> <div class="layui-input-block"> <input class="layui-input" name="modiTime" id="modiTime$" placeholder="请输入修改时间"> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">修改人员: </label> <div class="layui-input-block cool-auto-complete"> <input class="layui-input" name="modiUser" placeholder="请输入修改人员" style="display: none"> <input id="modiUser$" name="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入修改人员" onfocus=this.blur()> <div class="cool-auto-complete-window"> <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> </div> </div> <hr class="layui-bg-gray"> <div class="layui-form-item text-right"> <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button> <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button> </div> </form> </script> </html>
