分盘/紧急/包装料按生成时间顺序进行出库

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

@@ -126,12 +126,7 @@ public class QisdaApiController extends BaseController {
             return "系统更新中,暂停出库,请稍后再试";
         }
         String hSerial = request.getParameter("hSerial");
-        String maxReelStr = request.getParameter("max");
-        int maxReelNum = -1;
-        if(maxReelStr != null){
-            maxReelNum = Integer.valueOf(maxReelStr);
-        }
-        return checkOutOutItems(hSerial,maxReelNum);
+        return checkOutOutItems(hSerial);
     }
 
     /**
@@ -1357,7 +1352,7 @@ public class QisdaApiController extends BaseController {
         return tasks;
     }
 
-    private String checkOutOutItems(String hSerial, int maxReelNum){
+    private String checkOutOutItems(String hSerial){
         log.info("执行需求单["+hSerial+"]出库");
         OutInfo outInfo = outInfoDao.findByHSerial(hSerial);
         if(outInfo == null){
@@ -1430,12 +1425,6 @@ public class QisdaApiController extends BaseController {
                 }
             }
             outInfoCache.updateOutItem(outItem.getId());
-            if(maxReelNum != -1){
-                if(tasks.size() >= maxReelNum){
-                    log.info("限制料盘数为:"+maxReelNum);
-                    break;
-                }
-            }
         }
 
 

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

@@ -916,16 +916,21 @@ public class TaskService implements ITaskService {
 
 
         //if(DataCache.isProductionFor(DataCache.CUSTOMER.QISDA)){
-            //分盘料
-            for (DataLog task : waitTasks) {
-                if(cid.equals(task.getCid()) && task.isCheckOutTask() && task.isWait()) {
-                    //需要分盘的料,且不是包装料,统一都放到料串上,可以先出
-                    if(task.isCutReel() || task.isUrgentReel()){
-                        log.info("出库分盘/紧急料任务"+task.getBarcode()+"["+task.getPosName()+"]");
-                        return task;
+        //分盘料,按时间顺序进行出库
+        DataLog urgentTask = null;
+        for (DataLog task : waitTasks) {
+            if(cid.equals(task.getCid()) && task.isCheckOutTask() && task.isWait()) {
+                //分盘料,紧急料和包装料,可以按时间顺序先出
+                if(task.isCutReel() || task.isUrgentReel() || task.isPackageReel()){
+                    if(urgentTask == null || urgentTask.getCreateDate().after(task.getCreateDate())){
+                        urgentTask = task;
                     }
                 }
             }
+        }
+        if(urgentTask != null){
+            log.info("出库最先生成的分盘/紧急/包装料任务"+urgentTask.getBarcode()+"["+urgentTask.getPosName()+"]");
+        }
 
             //按料架顺序,从小盘开始出库
             boolean hasFirstReelAction = false;