Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -532,7 +532,14 @@ public class TaskService {
                     statusBean.setOp(OP.CHECKOUT);
                     statusBean.setOp(OP.CHECKOUT);
                     String posName = task.getPosName();
                     String posName = task.getPosName();
 
 
-                    Barcode codeObj = barcodeManager.findByBarcode(task.getBarcode());
+                    Barcode codeObj = null;
+                    StoragePos storagePos = storagePosManager.getByBarcode(task.getBarcode());
+                    if (storagePos != null){
+                        codeObj = storagePos.getBarcode();
+                    }
+                    if (codeObj == null) {
+                         codeObj = barcodeManager.findByBarcode(task.getBarcode());
+                    }
                     int plateW = 0;
                     int plateW = 0;
                     int plateH = 0;
                     int plateH = 0;
                     //是否是单盘出库,批量上下料使用
                     //是否是单盘出库,批量上下料使用