From 42d37ce9f59c15801cde7d63a439156934978bb4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 30 八月 2024 11:41:24 +0800
Subject: [PATCH] 8.26-8.29售后维护升级 1.增加逻辑：料架退回二次接力后，当仓储车准备送回库内时先查询此料架是否有其他线需要使用，有则直接从当前上片位送至下一上片位（省去中间退库，再从库内送至下一上片位的动作） 2.增加逻辑：当派尔开工下发任务料架顺序为，2，4，2类型时，上片机吸完2号架后退回二次接力但不能退库，等待4号架吸片完成退回二次接力后，2号架再从二次接力推进上片位然后亮灯（此时料架任务自动切换成下第二个2号架任务） 3.增加页面弹窗：仓储待执行任务 4.增加汇报逻辑：除原先仓储完成后汇报派尔料架已回库外，另外增加检索只要北玻系统完成但派尔未确认的都进行汇报直至派尔确认 5.修改页面查询：已完成任务仅查询一百条 6.定期删除完成数据
---
江苏皓晶项目/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
index 60535d0..8621c64 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
@@ -73,13 +73,19 @@
//System.out.println(taskstate);
List<OutTasks> OutTasks=new ArrayList<OutTasks>();
if("2".equals(taskstate)){
- OutTasks=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ List<OutTasks> lists=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ if(lists.size()>0&&lists.size()<=100){
+ OutTasks=lists.subList(0, lists.size());
+ }
PageHeads="宸插畬鎴愪换鍔�";
}else if("1".equals(taskstate)){
OutTasks=outTasksDao.FindNoMesStatus("娲惧皵纭浠诲姟瀹屾垚");
PageHeads="鏈畬鎴愪换鍔�";
}else if("0".equals(taskstate)){
- OutTasks=outTasksDao.findAll();
+ List<OutTasks> lists=outTasksDao.FindAll100();
+ if(lists.size()>0&&lists.size()<=100){
+ OutTasks=lists.subList(0, lists.size());
+ }
PageHeads="鍏ㄩ儴浠诲姟";
}
int sumcount=OutTasks.size()%ContentCount!=0?OutTasks.size()/ContentCount+1:OutTasks.size()/ContentCount;
@@ -89,8 +95,39 @@
model.addAttribute("ContentCountHtml",ContentCountHtml);
model.addAttribute("OutTaskshtml",OutTaskshtml(OutTasks,count,ContentCount));
model.addAttribute("Buttonshtml",Buttonshtml(OutTasks.size(),count,ContentCount));
- return "alltasks/tasks";
+ return "alltasks/tasks2";
}
+
+ //鍏ㄩ儴浠诲姟鐣岄潰
+ @RequestMapping(method = RequestMethod.GET,value="/loadMachine")
+ public String loadMachine(Model model,HttpServletRequest request,HttpServletResponse response) {
+ return "alltasks/loadMachine";
+ }
+ //姝ょ嚎璺殑 涓婄墖宸ヤ綅
+ @RequestMapping(method = RequestMethod.POST,value="/loadRackLine")
+ @ResponseBody
+ public List<LoadRack> loadRackLine(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<LoadRack> loadRacks=loadRackDao.findRackName(line);//涓婄墖宸ヤ綅
+ return loadRacks;
+ }
+ @RequestMapping(method = RequestMethod.POST,value="/alltasksdata")
+ @ResponseBody
+ public List<OutTasks> alltasksdata(Model model,HttpServletRequest request) {
+ String state=request.getParameter("state");//浠诲姟鐘舵��
+ List<OutTasks> OutTasks=new ArrayList<OutTasks>();
+ if("2".equals(state)){
+ OutTasks=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ }else if("1".equals(state)){
+ OutTasks=outTasksDao.FindNoMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ }else if("0".equals(state)){
+ OutTasks=outTasksDao.findAll();
+ }
+ return OutTasks;
+ }
+
+
+
//涓�鍏卞灏戞暟鎹紝绗灏戦〉锛屼竴椤靛灏戣 50,2,10
public String Buttonshtml(int Size,int Count,int ContentCount){
String Buttonhtmls="";
@@ -221,7 +258,7 @@
String WorkStatus="";//鏄惁鍦ㄥ伐浣�
String LoadWorkStatus=(loadRack.getMachineLoad()==null?"":loadRack.getMachineLoad().getWorkState());//鏄惁鍦ㄥ伐浣�;
String FlagButton=loadRack.getFlag();//鍚敤鐘舵��
- String StatsButton=loadRack.getFlag();//鏂欐灦鐘舵��
+ String StatsButton="";//鏂欐灦鐘舵��
int Loade=0;//寰呬笂鏁伴噺
int sum1=0;
int sum2=0;
@@ -253,11 +290,15 @@
}else{
FlagButton="<button class=\"Rowbtn\" style=\"background-color: #fd5f56;margin-left:5px;\" onclick=\"EnableDisables('鍚敤','"+loadRack.getId()+"')\">绂佺敤</button>";
}
- if(!loadRack.getState().equals("浣跨敤涓�")){
- StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">绌洪棽</button>";
- }else{
- StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
- }
+// if(!loadRack.getState().equals("浣跨敤涓�")){
+// StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">绌洪棽</button>";
+// }else{
+// StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
+// }
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">绌洪棽</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浜伅','"+loadRack.getId()+"')\">浜伅</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('宸蹭寒鐏�','"+loadRack.getId()+"')\">宸蹭寒鐏�</button>";
LoadRackshtml+="<tr>";
LoadRackshtml+="<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
LoadRackshtml+="<td class=\"RackId\">"+Id+"</td>";
@@ -440,6 +481,7 @@
String Types=request.getParameter("Types");
String Stusts=request.getParameter("Stusts");
String TaskIdHtml=request.getParameter("TaskIdHtml");
+ System.out.println(Types+","+Stusts+","+TaskIdHtml);
try {
List<OutTasks> OutTasks=outTasksDao.FindOutTasksTaskIds(TaskIdHtml);
for(OutTasks OutTask:OutTasks){
--
Gitblit v1.8.0