更新料盘状态后,返回剩余任务数改为当前料仓的剩余任务数

为料仓分配任务时,去除与最早创建时间一样的限制

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDeviceController.java

@@ -936,36 +936,25 @@ public class QisdaDeviceController extends BaseController {
 
             //剩余任务数
             String taskCid = task.getCid();
-            Date taskDate = task.getCreateDate();
+            String tempRfid = task.getTempRfid();
             Collection<DataLog> waitTasks = taskService.getQueueTasks();
-            int taskCount = 0;
-
-            int packageCutShelf = 0;
-            int packageUrgentTask = 0;
+            int sameTaskCount = 0;
 
             //同一个料仓的出库任务(等待中和正在执行的)
             for (DataLog waitTask : waitTasks) {
                 String waitCid = waitTask.getCid();
-                Date waitTaskDate = waitTask.getCreateDate();
-                if(waitTask.isCheckOutTask() && waitCid != null && waitCid.equals(taskCid) && waitTaskDate.equals(taskDate)){
-                    taskCount = taskCount + 1;
-                }
+                String waitTempRfid = waitTask.getTempRfid();
 
-                if(waitTask.isCheckOutTask() && waitTask.isPackageReel()){
-                    if(waitTask.isCutReel()){
-                        packageCutShelf = packageCutShelf + 1;
-                    }else if(waitTask.isUrgentReel() || waitTask.isLessSendReel() || waitTask.getAppendInfo().isCheckAction()){
-                        packageUrgentTask = packageUrgentTask + 1;
-                    }
+                //同一个仓,同一个料架的任务
+                if(waitTask.isCheckOutTask() && waitCid != null && waitCid.equals(taskCid) && waitTempRfid.equals(tempRfid)){
+                    sameTaskCount = sameTaskCount + 1;
                 }
 
             }
 
-            //InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.CUT_SHELF_MAP_KEY);
-            //InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.URGENT_SHELF_MAP_KEY);
 
             Map<String,Object> resultMap = new HashMap<>();
-            resultMap.put("taskCount",taskCount+"");
+            resultMap.put("taskCount",sameTaskCount+"");
             return ResultBean.newOkResult(resultMap);
         }
 

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -1083,31 +1083,16 @@ public class TaskService implements ITaskService {
 //            }
             for (DataLog waitTask : waitTasks) {
                 if (storage.getCid().equals(waitTask.getCid()) && waitTask.isPackageReel() && waitTask.isCheckOutTask()) {
-                    if(waitTask.getCreateDate().equals(earliestTask.getCreateDate())){
-                        //与创建最早的任务同时创建的
-                        AppendInfo appendInfo = waitTask.getAppendInfo();
-                        int rfidIndex = appendInfo.getRfidIndex();
-                        if(rfidIndex <= earliestTask.getAppendInfo().getRfidIndex()){
+                    //if(waitTask.getCreateDate().equals(earliestTask.getCreateDate())){
+                        //同一个料架的
+                        String tempRfid = waitTask.getTempRfid();
+                        if(tempRfid.equals(earliestTask.getTempRfid())){
                             storageTask = waitTask;
                             break;
                         }
-                    }
+                    //}
                 }
 
-                //与最小料架号一样的紧急料,修改其他紧急料的时间
-//                if(earliestTask.isUrgentReel() || earliestTask.isCutReel()){
-//                    if(waitTask.isPackageReel() && waitTask.isWait()){
-//                        if(waitTask.getTempRfid().equals(earliestTask.getTempRfid())){
-//                            Date earliestTaskDate = earliestTask.getCreateDate();
-//                            if(!waitTask.getCreateDate().equals(earliestTaskDate)){
-//                                log.info("修改紧急包装料["+waitTask.getBarcode()+"]的任务创建时间与["+earliestTask.getBarcode()+"]保持一致");
-//                                waitTask.setCreateDate(earliestTaskDate);
-//                                taskMap.put(waitTask.getId(), waitTask);
-//                            }
-//                        }
-//                    }
-//                }
-
             }
         }
         return storageTask;

myproject/src/main/webapp/decorators/metro.jsp

@@ -239,7 +239,7 @@
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: V2023060115</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023070413</span>
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
   </div>