1 第一个需求单所有料都出到皮带线上之后,才允许第二个需求单执行

2 没有设置线别的需求单不允许执行

myproject/src/main/java/com/myproject/bean/qisda/AppendInfo.java

@@ -309,6 +309,10 @@ public class AppendInfo {
         return getAction().contains("急料") || getAction().contains("指定") || getAction().contains("单独出库") || isCheckAction();
         return getAction().contains("急料") || getAction().contains("指定") || getAction().contains("单独出库") || isCheckAction();
     }
     }
 
 
+    public boolean isPnAction(){
+        return getAction().contains("PN");
+    }
+
     /**
     /**
      * 盘点出库需求单
      * 盘点出库需求单
      */
      */

myproject/src/main/java/com/myproject/bean/qisda/SoseqLockInfo.java

-package com.myproject.bean.qisda;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by sunke on 2020/6/12.
- */
-public class SoseqLockInfo {
-    /**
-     * 工单序号
-     */
-    private String soseq;
-
-    private String so;
-
-    /**
-     * 站位序号
-     */
-    private List<LockItemInfo> lockItems = new ArrayList<>();
-
-    public List<LockItemInfo> getLockItems() {
-        return lockItems;
-    }
-
-    public void setLockItems(List<LockItemInfo> lockItems) {
-        this.lockItems = lockItems;
-    }
-
-    public String getSo() {
-        return so;
-    }
-
-    public void setSo(String so) {
-        this.so = so;
-    }
-
-    public String getSoseq() {
-        return soseq;
-    }
-
-    public void setSoseq(String soseq) {
-        this.soseq = soseq;
-    }
-
-    public void addLockItem(LockItemInfo lockItem){
-        lockItems.add(lockItem);
-    }
-}

myproject/src/main/java/com/myproject/bean/update/DataLog.java

@@ -618,10 +618,10 @@ public class DataLog extends BaseMongoBean /*implements Comparable<DataLog>*/ {
     }
     }
 
 
     /**
     /**
-     * 是否是在皮带线上
+     * 是否是在流水线上
      */
      */
     public boolean isInBelt(){
     public boolean isInBelt(){
-        return status.toLowerCase().equals("inbelt");
+        return status.toLowerCase().equals("inbelt") || status.toLowerCase().equals("inline") || status.toLowerCase().equals("inrobot");
     }
     }
 
 
     /**
     /**

myproject/src/main/java/com/myproject/bean/update/qisda/OutInfo.java

@@ -32,6 +32,9 @@ public class OutInfo extends BaseMongoBean {
         this.taskNeedOutDate = needOutDate;
         this.taskNeedOutDate = needOutDate;
         this.mdate = outItem.getMdate();
         this.mdate = outItem.getMdate();
         this.endOutInfo = outItem.isTheEndOutInfo();
         this.endOutInfo = outItem.isTheEndOutInfo();
+        if(outItem.isPnAction()){
+            this.endOutInfo = true;
+        }
     }
     }
 
 
     /**
     /**

myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java

@@ -889,6 +889,10 @@ public class OutInfoCache {
             return ResultBean.newErrorResult(1001,"未找到需求单",false);
             return ResultBean.newErrorResult(1001,"未找到需求单",false);
         }
         }
 
 
+        if(Strings.isBlank(outInfo.getLine())){
+            return ResultBean.newErrorResult(1007,"未设置线别",false);
+        }
+
         String hSerial = outInfo.gethSerial();
         String hSerial = outInfo.gethSerial();
         String executingHSerial = QisdaCache.getCurrentOrderHSerial();
         String executingHSerial = QisdaCache.getCurrentOrderHSerial();
         if(hSerial.equals(executingHSerial)){
         if(hSerial.equals(executingHSerial)){
@@ -908,20 +912,22 @@ public class OutInfoCache {
 
 
         //是否有工单料任务
         //是否有工单料任务
         boolean hasOrderTask = false;
         boolean hasOrderTask = false;
-        boolean hasUrgenReel = false;
         for (DataLog dataLog : allTasks) {
         for (DataLog dataLog : allTasks) {
-            if(dataLog.isCheckOutTask()){
+            if(dataLog.isCheckOutTask() && !dataLog.isFinished() && !dataLog.isCancel()){
                 //if(!dataLog.isUrgentReel() && !dataLog.isCutReel() && !dataLog.isLessSendReel()){
                 //if(!dataLog.isUrgentReel() && !dataLog.isCutReel() && !dataLog.isLessSendReel()){
                 if(dataLog.getAppendInfo().isTailAction() || dataLog.getAppendInfo().isFirstReelAction()){
                 if(dataLog.getAppendInfo().isTailAction() || dataLog.getAppendInfo().isFirstReelAction()){
                     //工单料(不是指定料也不是分盘料即首盘或补料)
                     //工单料(不是指定料也不是分盘料即首盘或补料)
                     hasOrderTask = true;
                     hasOrderTask = true;
+                }else if(dataLog.getAppendInfo().isPnAction()){
+                    if(!dataLog.isInBelt()){
+                        return ResultBean.newErrorResult(1006,"上一需求单全部任务出库完成后才可执行",false);
+                    }
                 }else{
                 }else{
                     //分盘和紧急料或缺料补发的料
                     //分盘和紧急料或缺料补发的料
                     String taskHSerial = dataLog.getAppendInfo().gethSerial();
                     String taskHSerial = dataLog.getAppendInfo().gethSerial();
                     if(taskHSerial.equals(outInfo.gethSerial())){
                     if(taskHSerial.equals(outInfo.gethSerial())){
                         return ResultBean.newErrorResult(1002,"当前需求单还有未完成的任务",false);
                         return ResultBean.newErrorResult(1002,"当前需求单还有未完成的任务",false);
                     }
                     }
-                    hasUrgenReel = true;
                 }
                 }
             }
             }
         }
         }

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

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