无可用料盘时,PN不展示,不能再出库

出库时中文提示修改

myproject/src/main/java/com/myproject/webapp/controller/storage/CodeShelfController.java

@@ -349,7 +349,15 @@ public class CodeShelfController extends BaseController {
                 codeShelfList.add(storage);
             }
         }
-        return dataCache.getInventory(codeShelfList).values();
+        Collection<InventoryItem> allInventory = dataCache.getInventory(codeShelfList).values();
+        List<InventoryItem> inventoryList = new ArrayList<>();
+        for (InventoryItem inventoryItem : allInventory) {
+            int availableNum = inventoryItem.getStockReel() - inventoryItem.getLockReel();
+            if(availableNum > 0){
+                inventoryList.add(inventoryItem);
+            }
+        }
+        return inventoryList;
     }
 
     @RequestMapping(value = "/service/store/codeShelf/currentPos")

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

@@ -208,7 +208,7 @@ public class StorageDataController extends BaseController {
         for (StoragePos lockPos : lockPoses) {
             if(excludePosids.contains(lockPos.getId())){
                 log.info("工单["+orderName+"]任务正在执行");
-                return "1工单["+orderName+"]任务正在执行";
+                return "1" + getText("order.error.executing",request.getLocale(),"工单["+orderName+"]任务正在执行");
             }
         }
         for (StoragePos lockPos : lockPoses) {

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

@@ -1544,7 +1544,8 @@ public class TaskService implements ITaskService {
             if(!forceOut){
                 String msg = "库位["+pos.getPosName()+"]中已无物料,忽略";
                 log.info(msg);
-                return msg;
+                //return msg;
+                return "allBoxView.noReel";
             }
         }
 
@@ -1554,7 +1555,8 @@ public class TaskService implements ITaskService {
             if(taskInList.getPosId().equals(pos.getId())){
                 String msg = "库位【"+pos.getPosName()+"已在任务列表中,忽略】";
                 log.info(msg);
-                return msg;
+                //return msg;
+                return "order.error.executing";
             }
         }
 

myproject/src/main/resources/ApplicationResources.properties

@@ -245,7 +245,7 @@ allBoxView.lastPage=Previous
 allBoxView.nextPage=Next
 allBoxView.findAndOut=Material Search
 allBoxView.outTitle=Material Retrieval
-allBoxView.noReel=No Material Found
+allBoxView.noReel=No material available
 allBoxView.msg.title=Message
 allBoxView.msg.cancelMsg=Are you sure to cancel the task ?
 checkoutSettings.title=Material Retrieval Tatic

myproject/src/main/resources/StorageResources.properties

@@ -378,6 +378,7 @@ order.out.set=set of materials
 order.out.surplus=surplus material
 order.out.failed=Can not execute task
 order.out.notFound=The order info was not found
+order.error.executing=The task is executing.
 order.inventory=inventory
 order.num.modify=Order Qty Modify
 order.modify.tip=Modify Qty to\: current quantity times
@@ -386,7 +387,6 @@ order.close.empty=Order number is empty.
 order.close.notExist=The order of [{0}] is not found.
 order.close.success =Order Closed Successfully
 
-
 export.csv=Export to CSV
 
 workOrder.waitOut=waiting for execution

myproject/src/main/resources/StorageResources_en.properties

@@ -419,3 +419,4 @@ workOrder.supplementary=Replenishment
 storage.type.codeShelf=Code Shelf
 storage.type.accShelf=Smart Shelf
 storagePos.warmPos=Is Warm Location
+order.error.executing=The task is executing.

myproject/src/main/resources/StorageResources_jp.properties

@@ -418,3 +418,4 @@ workOrder.supplementary=\u88DC\u5145
 storage.type.codeShelf=Code Shelf
 storage.type.accShelf=Smart Shelf
 storagePos.warmPos=Is Warm Location
+order.error.executing=The task is executing.

myproject/src/main/resources/StorageResources_zh_CN.properties

@@ -419,3 +419,4 @@ error.barcode.manyvalid=[{0}]\u627E\u5230\u591A\u4E2A\u6709\u6548\u6761\u7801
 storage.type.codeShelf=\u626B\u7801\u6599\u67B6
 storage.type.accShelf=\u667A\u80FD\u6599\u67B6
 storagePos.warmPos=\u662F\u5426\u662F\u56DE\u6E29\u5E93\u4F4D
+order.error.executing=\u4EFB\u52A1\u6B63\u5728\u6267\u884C

myproject/src/main/webapp/WEB-INF/pages/storage/codeShelf.jsp

@@ -214,7 +214,7 @@
                     error = false;
                     msg = msg.substr(1);
                 }
-                if(msg.indexOf("x") == 0){
+                if(msg.indexOf("x") == 0 || msg.indexOf("1") == 0){
                     msg = msg.substr(1);
                 }
                 if(error){

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

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