Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -326,7 +326,8 @@ public class NLShelfHandler extends BaseDeviceHandler {
     }
 
     private ResultBean outProcess(String code, String sourceId, String loginUser,HttpServletRequest request){
-        Barcode barcode = codeResolve.resolveOneValideBarcode(code);
+        String barcodeStr = "=1x1=" + code;
+        Barcode barcode = codeResolve.resolveOneValideBarcode(barcodeStr);
         StoragePos inPos = storagePosManager.getByBarcode(barcode.getBarcode());
         if (inPos != null) {
             Collection<DataLog> allTasks = taskService.getQueueTasks();
@@ -344,16 +345,17 @@ public class NLShelfHandler extends BaseDeviceHandler {
                     opPosLight("close", inPos, "");
                     log.info(code + " 出库完成, 库位[" + inPos.getPosName() + "]灭灯");
                     String orderId = task.getSourceId();
-                    String orderFinishedTxt = "";
+                    Map<String,String> dataMap = new HashMap<>();
                     if (!Strings.isNullOrEmpty(orderId)) {
                         LiteOrder liteOrder = liteOrderManager.get(orderId);
                         if (liteOrder != null && liteOrder.isTaskFinished()) {
                             //工单任务已完成
                             String orderNo = liteOrder.getOrderNo();
-                            orderFinishedTxt = MessageUtils.getText("smfcore.order.finished", new String[]{orderNo}, request.getLocale(), "工单["+orderNo+"]的任务已全部完成");
+                            String orderFinishedTxt = MessageUtils.getText("smfcore.order.finished", new String[]{orderNo}, request.getLocale(), "工单["+orderNo+"]的任务已全部完成");
+                            dataMap.put("orderFinishedTxt",orderFinishedTxt);
                         }
                     }
-                    return ResultBean.newOkResult( "smfcore.shelf.msg.outConfirm", "出库完成, 库位[{0}]灭灯", new String[]{inPos.getPosName()} ,orderFinishedTxt);
+                    return ResultBean.newOkResult( "smfcore.shelf.msg.outConfirm", "出库完成, 库位[{0}]灭灯", new String[]{inPos.getPosName()} ,dataMap);
                 }
             }
             return ResultBean.newErrorResult(1, "smfcore.shelf.msg.noTask", "操作失败,已在库位[{0}]中,未找到对应的出库任务", new String[]{inPos.getPosName()});

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -448,7 +448,7 @@ public class DataCache {
             posNameList = new ArrayList<>();
             if(storage != null){
                 log.info("加载["+cid+"]所有已使用库位到缓存");
-                List<StoragePos> allPos = storagePosManager.findNotEmptyByStorageId(storage.getId());
+                List<StoragePos> allPos = storagePosManager.findUsedPosNameByStorageId(storage.getId());
                 for (StoragePos pos : allPos) {
                     posNameList.add(pos.getPosName());
                 }

src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java

@@ -27,6 +27,8 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
 
     List<StoragePos> findNotEmptyByStorageId(String storageId);
 
+    List<StoragePos> findUsedPosNameByStorageId(String storageId);
+
     List<StoragePos> findLockPos(String lockId);
 
     StoragePos findPartNumberInStorages(List<String> storageIdList, String pn, Collection<String> excludePosIds, CHECKOUT_TYPE checkOutType);

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -238,6 +238,18 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     }
 
     @Override
+    public List<StoragePos> findUsedPosNameByStorageId(String storageId) {
+        Criteria c = Criteria.where("barcode").exists(true)
+                .and("enabled").is(true);//可用;
+        if(!Strings.isNullOrEmpty(storageId)){
+            c = c.and("storageId").is(storageId);
+        }
+        Query query = new Query(c);
+        query.fields().include("posName").exclude("id");
+        return storagePosDao.findByQuery(query);
+    }
+
+    @Override
     public List<StoragePos> findLockPos(String lockId) {
         Criteria c = Criteria.where("barcode.lockId").is(lockId);
         return findByQuery(new Query(c));