料盒操作页面,展示需要出库的物料

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -247,4 +247,7 @@ public class BarcodeDto implements Serializable {
 
 
     @ApiModelProperty("第一次入库时间")
     @ApiModelProperty("第一次入库时间")
     private Date firstPutInDate;
     private Date firstPutInDate;
+
+    @ApiModelProperty("是否需要出库")
+    private boolean isOut = false;
 }
 }

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -161,11 +161,15 @@ public class Barcode extends BasePo implements Serializable {
     private List<Barcode> subCodeList;
     private List<Barcode> subCodeList;
 
 
     /**
     /**
-     *
+     * orderItemId
      */
      */
     private String orderItemId;
     private String orderItemId;
 
 
     /**
     /**
+     * 是否要出库,true是出库
+     */
+    private boolean isOut = false;
+    /**
      * 是否是锡膏
      * 是否是锡膏
      */
      */
     public boolean isSolder() {
     public boolean isSolder() {

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -448,11 +448,11 @@ public class LiteOrderCache {
                         task.setStatus(OP_STATUS.WAIT.name());
                         task.setStatus(OP_STATUS.WAIT.name());
                         task.setSlotnum(orderItem.getSlotNum());
                         task.setSlotnum(orderItem.getSlotNum());
 //                        task = dataLogDao.save(task);
 //                        task = dataLogDao.save(task);
-                        taskService.addTaskToExecute(task);
-                    }
-                    //如果是RI出库，只有一盘，出完就结束
-                    if(cacheOrder.getType()==2){
-                        break;
+                        try {
+                            taskService.addTaskToExecute(task);
+                        } catch (Exception e) {
+                            log.info(task.getBarcode()+"--添加任务到队列中,执行失败:"+e.getMessage());
+                        }
                     }
                     }
 
 
                     //开始工单与料盘绑定
                     //开始工单与料盘绑定
@@ -461,6 +461,7 @@ public class LiteOrderCache {
                     Barcode barcode = barcodeManager.findByBarcode(orderItem.getRi());
                     Barcode barcode = barcodeManager.findByBarcode(orderItem.getRi());
                     if (barcode != null) {
                     if (barcode != null) {
                         barcode.setOrderItemId(orderItemId);
                         barcode.setOrderItemId(orderItemId);
+                        barcode.setOut(true);
                         barcodeManager.save(barcode);
                         barcodeManager.save(barcode);
                         //同时更新
                         //同时更新
                         Criteria c = Criteria.where("subCodeList.barcode").is(orderItem.getRi());
                         Criteria c = Criteria.where("subCodeList.barcode").is(orderItem.getRi());
@@ -473,6 +474,10 @@ public class LiteOrderCache {
                             barcodeManager.saveBarcode(parBarcode);
                             barcodeManager.saveBarcode(parBarcode);
                         }
                         }
                     }
                     }
+                    //如果是RI出库，只有一盘，出完就结束
+                    if(cacheOrder.getType()==2){
+                        break;
+                    }
                 }
                 }
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialBoxController.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.storage.rest;
 
 
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.SmfApi;