| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/crnOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -703,12 +703,15 @@ } else { staProtocol = staProtocol.clone(); } if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) { if (!staProtocol.isAutoing() || staProtocol.isLoading()) { continue; } TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString()); if (taskWrk == null) { continue; } if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0 || staProtocol.getWorkNo().equals(taskWrk.getWrkNo()))) { // 查询工作档 TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnProtocol.getLaneNo(), staDesc.getStnNo().toString()); if (taskWrk == null) { continue; } log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk)); // R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false); staProtocol.setWorkNo(taskWrk.getWrkNo()); src/main/java/com/zy/core/MainProcess.java
@@ -23,9 +23,9 @@ // 所属线程 private Thread thread; private Thread thread2; private Thread thread3; private Thread thread4; private Thread thread5; // private Thread thread3; // private Thread thread4; // private Thread thread5; /** * =====>> 开始工作 @@ -37,14 +37,14 @@ thread2 = new Thread(this::crnAndDevOtherRun); thread2.start(); thread5 = new Thread(this::demoRun5); thread5.start(); thread3 = new Thread(this::demoRun); thread3.start(); thread4 = new Thread(this::demoOpenRun); thread4.start(); // thread5 = new Thread(this::demoRun5); // thread5.start(); // // thread3 = new Thread(this::demoRun); // thread3.start(); // // thread4 = new Thread(this::demoOpenRun); // thread4.start(); } private void crnAndDevRun() { @@ -213,9 +213,9 @@ public void shutDown() { if (thread != null) thread.interrupt(); if (thread2 != null) thread2.interrupt(); if (thread3 != null) thread3.interrupt(); if (thread4 != null) thread4.interrupt(); if (thread5 != null) thread5.interrupt(); // if (thread3 != null) thread3.interrupt(); // if (thread4 != null) thread4.interrupt(); // if (thread5 != null) thread5.interrupt(); } } src/main/webapp/views/deviceOperate/crnOperate.html
@@ -75,21 +75,21 @@ </el-form-item> </el-form> <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline"> <el-form-item label="测试库位数量"> <el-input v-model="formParam.locMastDemoCount" placeholder="测试库位数量"></el-input> </el-form-item> <el-form-item label="原始出库库位"> <el-input v-model="formParam.locMastDemoF" placeholder="原始有物库位"></el-input> </el-form-item> <el-form-item label="原始空库位"> <el-input v-model="formParam.locMastDemoE" placeholder="原始无物库位"></el-input> </el-form-item> <el-form-item label="堆垛机放货站点"> <el-input v-model="formParam.staOutDemo" placeholder="堆垛机放货站点"></el-input> </el-form-item> <el-form-item label="堆垛机取货站点"> <el-input v-model="formParam.staIntDemo" placeholder="堆垛机取货站点"></el-input> </el-form-item> <!-- <el-form-item label="测试库位数量">--> <!-- <el-input v-model="formParam.locMastDemoCount" placeholder="测试库位数量"></el-input>--> <!-- </el-form-item>--> <!-- <el-form-item label="原始出库库位">--> <!-- <el-input v-model="formParam.locMastDemoF" placeholder="原始有物库位"></el-input>--> <!-- </el-form-item>--> <!-- <el-form-item label="原始空库位">--> <!-- <el-input v-model="formParam.locMastDemoE" placeholder="原始无物库位"></el-input>--> <!-- </el-form-item>--> <!-- <el-form-item label="堆垛机放货站点">--> <!-- <el-input v-model="formParam.staOutDemo" placeholder="堆垛机放货站点"></el-input>--> <!-- </el-form-item>--> <!-- <el-form-item label="堆垛机取货站点">--> <!-- <el-input v-model="formParam.staIntDemo" placeholder="堆垛机取货站点"></el-input>--> <!-- </el-form-item>--> </el-form> <el-form label-position="top" :inline="true" class="demo-form-inline"> <el-form-item label=""> @@ -98,9 +98,9 @@ <el-form-item label=""> <el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">可出</el-checkbox> </el-form-item> <el-form-item label=""> <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">演示</el-checkbox> </el-form-item> <!-- <el-form-item label="">--> <!-- <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">演示</el-checkbox>--> <!-- </el-form-item>--> </el-form> <div> <!-- <el-button @click="requestOperate('put')" type="primary">入库</el-button>-->
