暂停出库时,手动查找出库禁用

暂停出库时,工单料允许放到皮带线上
修正托盘信息时,如果条码已在库中,把当前料NG,已在库位中的物料出库

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

@@ -139,7 +139,7 @@ public class OutInfoCache {
     }
     }
 
 
 
 
-    private void setNextHSerialToCurrent(){
+    public void setNextHSerialToCurrent(){
         String nextHSerial = QisdaCache.getNextOrderHSerial();
         String nextHSerial = QisdaCache.getNextOrderHSerial();
         if(Strings.isNotBlank(nextHSerial)){
         if(Strings.isNotBlank(nextHSerial)){
             //没有预执行需求单时,不需要切换
             //没有预执行需求单时,不需要切换

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

@@ -1588,6 +1588,7 @@ public class QisdaDeviceController extends BaseController {
             if(outInfo != null && outInfo.isCheckAction()){
             if(outInfo != null && outInfo.isCheckAction()){
                 canReelToBelt = true;
                 canReelToBelt = true;
             }else{
             }else{
+                outInfoCache.setNextHSerialToCurrent();
                 canReelToBelt = hSerial.equals(QisdaCache.getCurrentOrderHSerial());
                 canReelToBelt = hSerial.equals(QisdaCache.getCurrentOrderHSerial());
             }
             }
             return ResultBean.newOkResult(canReelToBelt);
             return ResultBean.newOkResult(canReelToBelt);
@@ -1662,6 +1663,16 @@ public class QisdaDeviceController extends BaseController {
                             break;
                             break;
                         }
                         }
                     }
                     }
+
+                    if(task == null){
+                        //没找到任务或任务已完成, 查找料盘信息是否已在库位中, 把对应库位料盘出库
+                        StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
+                        if(pos != null){
+                            //如果已在库位中,那么自动将该库位的物料出库
+                            log.info("托盘检测时,出库已在库位["+pos.getPosName()+"]中的物料["+barcode.getBarcode()+"]");
+                            taskService.checkout(pos,"",true);
+                        }
+                    }
                 }
                 }
             }
             }
 
 

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

@@ -9,6 +9,7 @@ import com.myproject.bean.CodeBean;
 import com.myproject.bean.json.*;
 import com.myproject.bean.json.*;
 import com.myproject.bean.qisda.InquiryShelfBean;
 import com.myproject.bean.qisda.InquiryShelfBean;
 import com.myproject.bean.qisda.ReelLockPosInfo;
 import com.myproject.bean.qisda.ReelLockPosInfo;
+import com.myproject.bean.qisda.ResultBean;
 import com.myproject.bean.qisda.ShelfInfo;
 import com.myproject.bean.qisda.ShelfInfo;
 import com.myproject.bean.search.PageList;
 import com.myproject.bean.search.PageList;
 import com.myproject.bean.update.*;
 import com.myproject.bean.update.*;
@@ -255,6 +256,9 @@ public class StorageDataController extends BaseController {
     @RequestMapping(value = "/checkout.html")
     @RequestMapping(value = "/checkout.html")
     @ResponseBody
     @ResponseBody
     public String checkPos(HttpServletRequest request) {
     public String checkPos(HttpServletRequest request) {
+        if(dataCache.getSettings().isStopOut()){
+            return "1系统已暂停出库,请联系管理员或稍后再试";
+        }
 
 
         String cid = request.getParameter("cid");
         String cid = request.getParameter("cid");
         String partnumber = request.getParameter("pn");
         String partnumber = request.getParameter("pn");