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/configuration/ConfigController.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 1 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/configuration/ConfigController.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/configuration/ConfigController.java"
index af5cd6b..499fa79 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/configuration/ConfigController.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/configuration/ConfigController.java"
@@ -62,12 +62,25 @@
@Autowired
private DeviceService deviceService;
//鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
+ @RequestMapping(method = RequestMethod.GET,value="/manualOperation")
+ public String manualOperation(Model model) {
+ model.addAttribute("MachineCount",1);
+ return "configuration/manualOperation";
+ }
+
+ //鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
+ @RequestMapping(method = RequestMethod.GET,value="/taskInfo")
+ public String taskInfo(Model model) {
+ return "configuration/taskInfos";
+ }
+ //鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
@RequestMapping(method = RequestMethod.GET,value="/minche")
public String minche(Model model) {
String MachineOutTaskhtmls="";
List<Machine> Machines=machineDao.findAll();
Telecoms telecoms=telecomsDao.findOne(10L);
Telecoms telecomsShel=telecomsDao.findOne(1L);
+ String outTasksTasks="";
String InfoStats="鎮ㄧ殑杞欢灏嗕簬"+telecomsShel.getInterprets()+" 杩囨湡锛岃涓庝緵搴斿晢鑱旂郴";
if(telecomsShel.getInterprets().equals("")){
InfoStats="";
@@ -117,7 +130,17 @@
}
List<OutTasks> OutTasksTasking=outTasksDao.FindMachineStatusWorkStatus("绛夊緟寮�濮�","绛夊緟閫�鍥炲簱鍖�","姝ｅ湪宸ヤ綔","姝ｅ父");
List<OutTasks> OutTasksAll=outTasksDao.FindMachineStatusWorkStatus("绛夊緟寮�濮�","绛夊緟閫�鍥炲簱鍖�","绛夊緟涓�","姝ｅ父");
+
for(OutTasks OutTasks:OutTasksTasking){
+ outTasksTasks+="<tr style='background-color: #a3f4ab;'>"+
+ "<td>"+OutTasks.getTaskId()+"</td>"+
+ "<td>"+OutTasks.getStockName()+"</td>"+
+ "<td>"+OutTasks.getDestination()+"</td>"+
+ "<td>"+OutTasks.getRackNumber()+"</td>"+
+ "<td>"+(OutTasks.getPlanLoadNum1()+OutTasks.getPlanLoadNum2()+OutTasks.getPlanLoadNum3())+"</td>"+
+ "<td>"+OutTasks.getStockNum()+"</td>"+
+ "<td>"+(OutTasks.getMachineStatus().equals("绛夊緟寮�濮�")?"鍑哄簱":"閫�搴�")+"</td>"+
+ "</tr>";
OutTasksid=OutTasks.getId().toString();
OutTasksWorkStatus=OutTasks.getWorkStatus().toString();
OutTasksStockName=OutTasks.getStockName().toString();
@@ -125,6 +148,17 @@
OutTasksMachineStatus=OutTasks.getMachineStatus().toString();
OutTasksInfoContent=OutTasks.getInfoContent().toString();
break;
+ }
+ for(OutTasks OutTasks:OutTasksAll){
+ outTasksTasks+="<tr>"+
+ "<td>"+OutTasks.getTaskId()+"</td>"+
+ "<td>"+OutTasks.getStockName()+"</td>"+
+ "<td>"+OutTasks.getDestination()+"</td>"+
+ "<td>"+OutTasks.getRackNumber()+"</td>"+
+ "<td>"+(OutTasks.getPlanLoadNum1()+OutTasks.getPlanLoadNum2()+OutTasks.getPlanLoadNum3())+"</td>"+
+ "<td>"+OutTasks.getStockNum()+"</td>"+
+ "<td>"+(OutTasks.getMachineStatus().equals("绛夊緟寮�濮�")?"鍑哄簱":"閫�搴�")+"</td>"+
+ "</tr>";
}
OutTasksCount=(OutTasksAll.isEmpty()?"0":OutTasksAll.size()).toString();
}else if("load".equals(machine.getTypeId().getTypesName())){
@@ -242,6 +276,7 @@
MachineOutTaskhtmls+="</tr>";
}
model.addAttribute("InfoStats",InfoStats);
+ model.addAttribute("outTasksTasks",outTasksTasks);
model.addAttribute("MachineOutTaskhtmls",MachineOutTaskhtmls);
model.addAttribute("MachineCount",Machines.size());
return "configuration/minche";
@@ -302,7 +337,66 @@
}
return "鏃犳晥鎿嶄綔!";
}
-
+ // 鎵嬪姩椤甸潰 鏈畬鎴愮殑浠撳偍浠诲姟
+ @RequestMapping(method = RequestMethod.POST, value = "/selectOutTasks")
+ @ResponseBody
+ public List<OutTasks> selectOutTasks(HttpServletRequest request, Model model) {
+ List<OutTasks> list=outTasksDao.findWaitTask();
+ return list;
+ }
+ // 鎵嬪姩椤甸潰 娣诲姞鎵嬪姩浠诲姟
+ @RequestMapping(method = RequestMethod.POST, value = "/addTask")
+ public String addTask(HttpServletRequest request, Model model) {
+ String start=request.getParameter("start");
+ String end=request.getParameter("end");
+ String stock=request.getParameter("stock");
+ OutTasks OutTasksadd=new OutTasks();
+ OutTasksadd.setId(2L);
+ OutTasksadd.setTaskId("1");
+ OutTasksadd.setTaskType("鎵嬪姩浠诲姟");
+ OutTasksadd.setMesStatus("");
+ OutTasksadd.setMachineStatus("");
+ OutTasksadd.setWorkStatus("绛夊緟涓�");
+ OutTasksadd.setPkgId(1);
+ OutTasksadd.setStockName("1");
+ OutTasksadd.setDestination("涓婄墖鍙�1");
+ OutTasksadd.setPlanLoadNum1(0);
+ OutTasksadd.setPlanLoadNum2(0);
+ OutTasksadd.setPlanLoadNum3(0);
+ OutTasksadd.setStockNum(0);
+ OutTasksadd.setLoadeNum(0);
+ OutTasksadd.setNewPkgId(1);
+ OutTasksadd.setNewPkgNum(0);
+ OutTasksadd.setBb(0);
+ OutTasksadd.setHh(0);
+ OutTasksadd.setColor("");
+ OutTasksadd.setThickness(0);
+ OutTasksadd.setPkgNum(0);
+ OutTasksadd.setStockThickness(0);
+ OutTasksadd.setTaskIds(1L);
+ OutTasksadd.setPosunCount(0);
+ OutTasksadd.setRackNumber("");
+ OutTasksadd.setInfoContent("");
+ OutTasksadd.setStartTime(new Date());
+ OutTasksadd.setFinshTime(new Date());
+ OutTasksadd.setFlag("姝ｅ父");
+ OutTasksadd.setLoadTime(new Date());
+ OutTasksadd.setPriority(900);
+ outTasksDao.save(OutTasksadd);
+ return "redirect:/Config/manualOperation";
+ }
+ // 鎵嬪姩椤甸潰 浠诲姟鎿嶄綔锛氥�愬彇娑�/瀹屾垚銆�
+ @RequestMapping(method = RequestMethod.POST, value = "/updateTask")
+ public String updateTask(HttpServletRequest request, Model model) {
+ String taskid=request.getParameter("taskid");
+ String Controls=request.getParameter("Controls");
+// OutTasks OutTasks=outTasksDao.findOne(Long.valueOf(taskid));
+// OutTasks.setMesStatus("");
+// OutTasks.setMachineStatus("");
+// OutTasks.setWorkStatus("");
+// outTasksDao.save(OutTasks);
+ return "redirect:/Config/manualOperation";
+ }
//澶у睆灞曠ず
@RequestMapping(method = RequestMethod.GET,value="/infomathion")
public String infomathion(Model model) {
--
Gitblit v1.8.0