| src/main/java/com/zy/asrs/entity/RgvOneSign.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/model/protocol/StaProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/RgvOneSignMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/console.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/RgvOneSign.java
New file @@ -0,0 +1,55 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @Data @TableName("bas_rgv_one_sign") public class RgvOneSign implements Serializable { private static final long serialVersionUID = 1L; /** * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 内容 */ @ApiModelProperty(value= "1楼标记") @TableField("rgv_one_sign") private Integer rgvOneSign; /** * 内容 */ @ApiModelProperty(value= "oneSign") @TableField("rgv_one_type") private String rgvOneType; public RgvOneSign() {} public RgvOneSign(Integer rgvOneSign) { this.rgvOneSign = rgvOneSign; } public RgvOneSign(Integer rgvOneSign, String rgvOneType) { this.rgvOneSign = rgvOneSign; this.rgvOneType = rgvOneType; } // RgvOneSign rgvOneSign = new RgvOneSign( // null // 内容[非空] // ); } src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
New file @@ -0,0 +1,15 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.RgvOneSign; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @Mapper @Repository public interface RgvOneSignMapper extends BaseMapper<RgvOneSign> { RgvOneSign selectOneSign(); } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -98,6 +98,8 @@ private WrkMastStaMapper wrkMastStaMapper; @Autowired private BasRgvMapMapper basRgvMapMapper; @Autowired private RgvOneSignMapper rgvOneSignMapper; @Value("${wms.url}") private String wmsUrl; @@ -1444,6 +1446,13 @@ log.error("查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType()); continue; } //退库模式跳过118、119出库任务 if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(); if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){ continue; } } // 获取源库位信息 LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo()); if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) { @@ -2169,6 +2178,10 @@ */ public synchronized void storeEmptyPlt3() { try{ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(); if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){ return; } for (RgvSlave rgvSlave:slaveProperties.getRgv()) { RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId()); RgvProtocol rgvProtocol = rgvThread.getRgvProtocol(); @@ -3049,7 +3062,7 @@ // 无拣料数据 continue; } if (!wrkMast.getSheetNo().equals("2") || wrkMast.getIoType()<100 || wrkMast.getWrkSts()!=14){ if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2") || wrkMast.getIoType()<100 || wrkMast.getWrkSts()!=14){ continue; } if (wrkMast.getIoType()==101){ @@ -3252,7 +3265,8 @@ }catch (Exception e){ } basDevp135.setReportSign(2); basDevpService.updateById(basDevp135); staProtocol135.setWorkNo(32222); int workNo = commonService.getWorkNo(7); staProtocol135.setWorkNo(workNo); staProtocol135.setStaNo(144); devpThread.setPakMk(staProtocol135.getSiteId(), false); boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol135)); @@ -3422,7 +3436,8 @@ /** * 入出库 ===>> 小车作业下发 */ public synchronized void rgvIoExecute(Integer sign) { public synchronized boolean rgvIoExecute(Integer sign) { boolean rgvIoExecuteSign = false; try{ for (RgvSlave rgvSlave:slaveProperties.getRgv()) { // 获取小车信息 @@ -3471,7 +3486,7 @@ break; } } for (int signCount = 1;!signWork && signCount<8;signCount++){ for (int signCount = 1;!signWork && signCount<7;signCount++){ switch (signCount){ case 1://执行小车货物搬运任务 signWork = rgvRunWrkMastFullSta(); @@ -3492,18 +3507,22 @@ // signWork = rgvRunWrkMastEmptyStaPut(); break; default: if (sign>6){ rgvRunWrkMastEmptyStaAvoidance();//避让 signWork = true; } break; } } if (!rgvIoExecuteSign){ rgvIoExecuteSign = signWork; } } if (!rgvIoExecuteSign){ if (sign>6){ rgvRunWrkMastEmptyStaAvoidance();//避让 } } }catch (Exception e){ log.error("RGV小车任务下发报错"+e); } return rgvIoExecuteSign; } /** * 执行小车搬运任务 src/main/java/com/zy/core/MainProcess.java
@@ -77,7 +77,10 @@ if (i<8) { // RGV ===>> 小车任务作业下发 try{ mainService.rgvIoExecute(i); boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); if (rgvIoExecuteSign && (i==6)){ i = 0; } }catch (Exception e){ log.error("RGV ===>> 小车任务作业下发异常"+e); } src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -62,7 +62,8 @@ basDevp.setAutoing(autoing?"Y":"N"); basDevp.setLoading(loading?"Y":"N"); basDevp.setEmptyMk(emptyMk?"Y":"N"); if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){ if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && (basDevp.getWrkNo()==0 || !basDevp.getWrkNo().equals(basDevp.getWrkNo1()))){ basDevp.setWrkNo1(workNo); basDevp.setReportSign(0); } basDevp.setInEnable(inEnable?"Y":"N"); src/main/resources/mapper/RgvOneSignMapper.xml
New file @@ -0,0 +1,16 @@ <?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.RgvOneSignMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RgvOneSign"> <id column="id" property="id" /> <result column="rgv_one_sign" property="rgvOneSign" /> <result column="rgv_one_type" property="rgvOneType" /> </resultMap> <select id="selectOneSign" resultMap="BaseResultMap"> SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type='oneSign' </select> </mapper> src/main/webapp/views/console.html
@@ -780,7 +780,7 @@ function carAnimate2() { // console.log("1=============1") $.ajax({ url: baseUrl + "/console/rgv/site/data", url: baseUrl + "/rgv/console/rgv/site/data", headers: {'token': localStorage.getItem('token')}, method: 'POST', success: function (res) {
