| zy-asc-conveyor/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/ConveyorBoot.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/enums/SlaveType.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zy-asc-conveyor/src/main/webapp/views/pipeline.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
zy-asc-conveyor/pom.xml
@@ -9,9 +9,11 @@ <version>1.0.0</version> </parent> <artifactId>conveyor</artifactId> <artifactId>acs-conveyor</artifactId> <packaging>war</packaging> <name>conveyor</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/ConveyorBoot.java
File was renamed from zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/Main.java @@ -9,10 +9,10 @@ @EnableAsync @SpringBootApplication @EnableScheduling public class Main extends SpringBootServletInitializer { public class ConveyorBoot extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(Main.class, args); SpringApplication.run(ConveyorBoot.class, args); } zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
@@ -41,7 +41,7 @@ @ResponseBody @PostMapping("/station/query") public R query(@RequestBody StationRequestParam param) { log.info("站点查询：{}", param); //log.info("站点查询：{}", param); List<String> staNos = param.getStaNos(); Map<Integer, StaProtocol> station = stationService.getStationMap(param.getDevpId()); List<StationResponseParam> list = new ArrayList<>(); @@ -61,7 +61,7 @@ stationResponseParam.setOnline(staProtocol.isAutoing()); list.add(stationResponseParam); } log.info("站点查询：{}", list); //log.info("站点查询：{}", list); return R.ok(list); }
File was deleted zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
@@ -195,4 +195,13 @@ } return "-"; } public String getTaskData() { return "本站点:" + siteId + "任务号：" + workNo + "目标站点：" + staNo; } public String getSafeSignalData() { return "本站点:" + siteId + "序号：" + safeSignal.getIndex() + "值：" + safeSignal.getValue() + "标志位：" + safeSignal.getFlag(); } } zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
@@ -2,7 +2,6 @@ import HslCommunication.Core.Types.OperateResult; import HslCommunication.Profinet.Siemens.SiemensS7Net; import com.alibaba.fastjson.JSON; import com.zy.acs.common.utils.News; import com.zy.acs.conveyor.core.constant.PlcConstant; import com.zy.acs.conveyor.core.enums.SafeSignalField; @@ -39,20 +38,20 @@ public void writeSafe(StaProtocol staProtocol) throws InterruptedException { if (staProtocol == null) { News.warn("写入数据为空，跳过 [id:{}]", JSON.toJSONString(staProtocol)); News.warn("写入安全信号，站点数据为空"); return; } SiemensS7Net siemensS7Net = devpS7Service.get(staProtocol.getPlcId()); if (siemensS7Net == null) { News.error("PLC未连接，无法写入 [id:{}]", JSON.toJSONString(staProtocol)); News.error("PLC未连接，无法写入 [id:{}]", staProtocol.getSafeSignalData()); return; } List<DevpSlave> devp = slaveProperties.getDevp(); DevpSlave devpSlave = devp.stream().filter(slave -> slave.getId().equals(staProtocol.getPlcId())).findFirst().orElse(null); if (devpSlave == null) { News.error("PLC未配置，无法写入 [id:{}]", JSON.toJSONString(staProtocol)); News.error("PLC未配置，无法写入 [id:{}]", staProtocol.getSafeSignalData()); return; } int index = devpSlave.getStaNos().indexOf(staProtocol.getSiteId()); @@ -88,17 +87,17 @@ OperateResult writeResult = siemensS7Net.Write(flagAddr, array); if (writeResult.IsSuccess) { News.info("写入安全信号输送线命令成功 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]", News.info("写入安全信号成功 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]", staProtocol.getPlcId(), staProtocol.getSiteId(), staProtocol.getWorkNo(), staProtocol.getStaNo(), writeCount); OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入安全信号输送线命令成功。输送线plc编号={1}，站点数据={2}", staProtocol.getPlcId(), JSON.toJSON(staProtocol))); OutputQueue.DEVP.offer(MessageFormat.format("写入安全信号输送线命令成功。输送线plc编号={0}，站点数据={1}", staProtocol.getPlcId(), staProtocol.getSafeSignalData())); success = true; break; } writeCount++; News.error("写入安全信号输送线命令失败 [id:{}] [siteId:{}] [retry:{}] [workErr:{}] ", News.error("写入安全信号失败 [id:{}] [siteId:{}] [retry:{}] [workErr:{}] ", staProtocol.getPlcId(), staProtocol.getSiteId(), writeCount, writeResult.Message); if (writeCount <= WRITE_RETRY) { @@ -107,31 +106,31 @@ } if (!success) { String errorMsg = MessageFormat.format("【{0}】写入安全信号输送线站点数据失败。输送线plc编号={1}，站点数据={2}", staProtocol.getPlcId(), JSON.toJSON(staProtocol)); String errorMsg = MessageFormat.format("写入安全信号失败。输送线plc编号={0}，站点数据={1}", staProtocol.getPlcId(), staProtocol.getSafeSignalData()); OutputQueue.DEVP.offer(errorMsg); News.error("SiemensDevp - 4 - 写入安全信号输送线站点数据失败。输送线plc编号={}，站点数据={}", staProtocol.getPlcId(), JSON.toJSON(staProtocol)); News.error("SiemensDevp - 4 - 写入安全信号失败。输送线plc编号={}，站点数据={}", staProtocol.getPlcId(), staProtocol.getSafeSignalData()); } } public void write(StaProtocol staProtocol) throws InterruptedException { if (staProtocol == null) { News.warn("写入数据为空，跳过 [id:{}]", JSON.toJSONString(staProtocol)); News.warn("写入任务数据,站点数据为空"); return; } SiemensS7Net siemensS7Net = devpS7Service.get(staProtocol.getPlcId()); if (siemensS7Net == null) { News.error("PLC未连接，无法写入 [id:{}]", JSON.toJSONString(staProtocol)); News.error("PLC未连接，无法写入 [id:{}]", staProtocol.getTaskData()); return; } List<DevpSlave> devp = slaveProperties.getDevp(); DevpSlave devpSlave = devp.stream().filter(slave -> slave.getId().equals(staProtocol.getPlcId())).findFirst().orElse(null); if (devpSlave == null) { News.error("PLC未配置，无法写入 [id:{}]", JSON.toJSONString(staProtocol)); News.error("PLC未配置，无法写入 [id:{}]", staProtocol.getTaskData()); return; } int index = devpSlave.getStaNos().indexOf(staProtocol.getSiteId()); @@ -160,8 +159,8 @@ News.info("写入输送线命令成功 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]", staProtocol.getPlcId(), staProtocol.getSiteId(), staProtocol.getWorkNo(), staProtocol.getStaNo(), writeCount); OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线命令成功。输送线plc编号={1}，站点数据={2}", staProtocol.getPlcId(), JSON.toJSON(staProtocol))); OutputQueue.DEVP.offer(MessageFormat.format("写入输送线命令成功。输送线plc编号={0}，站点数据={1}", staProtocol.getPlcId(), staProtocol.getTaskData())); success = true; break; } @@ -177,11 +176,11 @@ } if (!success) { String errorMsg = MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", staProtocol.getPlcId(), JSON.toJSON(staProtocol)); String errorMsg = MessageFormat.format("写入输送线站点数据失败。输送线plc编号={0}，站点数据={1}", staProtocol.getPlcId(), staProtocol.getTaskData()); OutputQueue.DEVP.offer(errorMsg); News.error("SiemensDevp - 4 - 写入输送线站点数据失败。输送线plc编号={}，站点数据={}", staProtocol.getPlcId(), JSON.toJSON(staProtocol)); staProtocol.getPlcId(), staProtocol.getTaskData()); } } zy-asc-conveyor/src/main/resources/mapper/JobMapper.xml
@@ -79,6 +79,13 @@ </select> <select id="listJobByDay" resultMap="BaseResultMap"> select * from cv_job where DATEDIFF(NOW(), create_time) > #{day} </select> <select id="listJobToLog" resultMap="BaseResultMap"> select * from cv_job zy-asc-conveyor/src/main/webapp/views/pipeline.html
@@ -781,12 +781,14 @@ <th>工作号</th> <th>自动</th> <th>有物</th> <th>可入</th> <th>可出</th> <th>入库标记</th> <th>空板信号</th> <th>需求入</th> <th>需求出</th> <th>重量信号</th> <th>空满信号</th> <th>目标站</th> <th>高低库位</th> <th>条码</th> <th>安全信号</th> <!-- <th>高低信号</th>--> </tr> </thead> <tbody> @@ -824,24 +826,25 @@ </div> <div class="form-group"> <label class="form-label" for="workNo">工作号:</label> <input id="workNo" name="workNo" type="number" class="form-input" <input id="workNo" name="workNo" type="number" min="0" class="form-input" autocomplete="off"> </div> <div class="form-group"> <label class="form-label" for="staNo">目标站:</label> <input id="staNo" name="staNo" type="number" class="form-input" <input id="staNo" name="staNo" type="number" min="0" class="form-input" autocomplete="off"> </div> <div class="form-group"> <label class="form-label" for="pakMk">入库标记:</label> <input id="pakMk" name="pakMk" type="text" class="form-input" autocomplete="off"> </div> <!-- <div class="form-group">--> <!-- <label class="form-label" for="pakMk">入库标记:</label>--> <!-- <input id="pakMk" name="pakMk" type="text" class="form-input"--> <!-- autocomplete="off">--> <!-- </div>--> </form> </div> <div class="modal-footer"> <button type="button" class="btn btn-primary" id="save">保存</button> <button type="button" class="btn btn-secondary" id="clear">清除</button> <button type="button" class="btn btn-secondary" id="safe">补充安全信号</button> <button type="button" class="btn btn-secondary" id="cancel">取消</button> </div> </div> @@ -987,10 +990,11 @@ ${site.outEnable === 'Y' ? 'Y' : 'N'} </span> </td> <td>${site.pakMk || '--'}</td> <td>${site.weight || '--'}</td> <td>${site.emptyMk || '--'}</td> <td>${site.staNo || '--'}</td> <td>${site.locType1 || '--'}</td> <td>${site.barcode || '--'}</td> <td>${site.allow || '--'}</td> </tr> `; } @@ -1081,8 +1085,7 @@ http.post(`${baseUrl}/site/detl/update`, { siteId: $('#siteId').val(), workNo: $('#workNo').val(), staNo: $('#staNo').val(), pakMk: $('#pakMk').val() staNo: $('#staNo').val() }, (res) => { showSuccessMessage("修改成功"); setTimeout(() => { @@ -1097,6 +1100,18 @@ $('#staNo').val(0); }); // 补充安全信号 $(document).on('click', '#safe', function () { http.post(`${baseUrl}/site/detl/safe`, { siteId: $('#siteId').val() }, (res) => { showSuccessMessage("补充成功"); setTimeout(() => { closeModal(); }, 1500); }); }); // 取消站点信息修改 $(document).on('click', '#cancel', function () { closeModal();
