Skip to content

孙克 / QisdaNew

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 93e6ce2d 由 sunke
选项

设备停机时, 所有任务完成后,流水线停止转动 

设备停机时, 当前入库任务完成后,不再抓取新的料盘
1 个父辈 26820f39
内嵌 并排
正在显示 5 个修改的文件 包含 95 行增加 和 9 行删除
README.md
...@@ -505,3 +505,34 @@ duration: 持续时长(秒) ...@@ -505,3 +505,34 @@ duration: 持续时长(秒)
{"AGVNum":"15号车","DateTime":"2021-06-16 00:32:40","EndDateTime":"2021-06-16 00:33:10","ErrorMsg":"在A1停留超时","ErrorLastTime":"0.50","TaskName":"取料串任务","AGVMissionName":"MoveA1","MissionInfo":"待机位/充电位收到任务，开始执行","TargetPlace":"A1","Type":"Error"} {"AGVNum":"15号车","DateTime":"2021-06-16 00:32:40","EndDateTime":"2021-06-16 00:33:10","ErrorMsg":"在A1停留超时","ErrorLastTime":"0.50","TaskName":"取料串任务","AGVMissionName":"MoveA1","MissionInfo":"待机位/充电位收到任务，开始执行","TargetPlace":"A1","Type":"Error"}
26 流水线抓取料盘前获取是否可以继续抓取料盘
>地址:
>>/rest/api/qisda/device/putInEnable
>
>参数:
>
> 返回:
>>` {"code":0,"msg":"ok","data":{"putInEnable":true}}`
>>
>> - code: 0为正常,其他为异常,
>> - msg:消息,
>> - data:
>> - putInEnable: false时不允许抓取下一盘,true是允许抓取(与当前流程一样)
27 流水线判断是否需要进行休眠(流水线停止转动)
>地址:
>>/rest/api/qisda/device/stopRun
>
>参数:
>
> 返回:
>>` {"code":0,"msg":"ok","data":{"unfinishedTask":10,"stopOut":true}}`
>>
>> - code: 0为正常,其他为异常,
>> - msg:消息,
>> - data:
>> - stopOut: 是否停止出库
>> - unfinishedTask: 剩余未完成任务数, 任务数为0且stopOut为true时,流水线停止转动,
> stopOut为false或未完成任务数大于0时, 流水线开始转动
\ No newline at end of file \ No newline at end of file
myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDeviceController.java
...@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
...@@ -1592,4 +1593,40 @@ public class QisdaDeviceController extends BaseController { ...@@ -1592,4 +1593,40 @@ public class QisdaDeviceController extends BaseController {
return ResultBean.newOkResult(canReelToBelt); return ResultBean.newOkResult(canReelToBelt);
} }
} }
/**
* 流水线抓取料盘前获取是否可以继续抓取料盘
*/
@RequestMapping("/putInEnable")
@ResponseBody
public ResultBean putInEnable(HttpServletRequest request, HttpServletResponse response){
Settings settings = dataCache.getSettings();
boolean putInEnable = settings.isStopIn();
Map<String,Object> dataMap = new HashMap<>();
dataMap.put("putInEnable",putInEnable);
return ResultBean.newOkResult(dataMap);
}
/**
* 流水线判断是否需要进行休眠(流水线停止转动)
*/
@RequestMapping("/stopRun")
@ResponseBody
public ResultBean stopRun(HttpServletRequest request, HttpServletResponse response){
int unfinishedTask = 0;
for (DataLog task : taskService.getAllTasks()) {
if(!task.isPackageReel()){
if(!task.isFinished() /*&& !task.isCancel()*/){
unfinishedTask = unfinishedTask + 1;
}
}
}
Settings settings = dataCache.getSettings();
boolean stopOut = settings.isStopOut();
Map<String,Object> dataMap = new HashMap<>();
dataMap.put("unfinishedTask",unfinishedTask);
dataMap.put("stopOut",stopOut);
return ResultBean.newOkResult(dataMap);
}
} }
myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java
...@@ -568,14 +568,14 @@ public class StorageDataController extends BaseController { ...@@ -568,14 +568,14 @@ public class StorageDataController extends BaseController {
Map<String,Object> resultMap = Maps.newHashMap(); Map<String,Object> resultMap = Maps.newHashMap();
//暂停入库时,包装料架例外,包装仓通过AGV不拉VMI线入库料架控制 //暂停入库时,包装料架例外,包装仓通过AGV不拉VMI线入库料架控制
if(dataCache.getSettings().isStopIn()){ // if(dataCache.getSettings().isStopIn()){
if(!StorageConstants.SHEFL_TYPE.isAShelf(rfid)){ // if(!StorageConstants.SHEFL_TYPE.isAShelf(rfid)){
lineMsg = "系统已暂停入库"; // lineMsg = "系统已暂停入库";
resultMap.put("result","100"); // resultMap.put("result","100");
resultMap.put("msg",lineMsg); // resultMap.put("msg",lineMsg);
return resultMap; // return resultMap;
} // }
} // }
String okMsg = ""; String okMsg = "";
String errorMsg = ""; String errorMsg = "";
......
myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp
...@@ -12,6 +12,24 @@ ...@@ -12,6 +12,24 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ul class="timeline"> <ul class="timeline">
<li class="timeline-blue">
<div class="timeline-time">
<span class="date">2022</span>
<span class="time">10-24</span>
</div>
<div class="timeline-icon">
<i class="fa fa-clock-o"></i>
</div>
<div class="timeline-body">
<h2>版本: V2022102411</h2>
<div class="timeline-content">
<ul>
<li>设备停机时, 所有任务完成后,流水线停止转动</li>
<li>设备停机时, 当前入库任务完成后,不再抓取新的料盘</li>
</ul>
</div>
</div>
</li>
<li class="timeline-yellow"> <li class="timeline-yellow">
<div class="timeline-time"> <div class="timeline-time">
<span class="date">2022</span> <span class="date">2022</span>
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
<div class="page-footer-inner"> <div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a> 2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div> </div>
<span class="right" style="color: #a3a3a3;">Version: 2022.07.0415</span> <span class="right" style="color: #a3a3a3;">Version: 2022.10.2411</span>
<div class="scroll-to-top"> <div class="scroll-to-top">
<i class="icon-arrow-up"></i> <i class="icon-arrow-up"></i>
</div> </div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!