8.26-8.29售后维护升级 1.增加逻辑：料架退回二次接力后，当仓储车准备送回库内时先查询此料架是否有其他线需要使用，有则直接从当前上片位送至下一...

严智鑫

2024-08-30 42d37ce9f59c15801cde7d63a439156934978bb4

 ½­ËÕ𩾧ÏîÄ¿/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) {