阳光电源看板设备按Name排序

出库扫码时不区分料架

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

@@ -186,7 +186,7 @@ public class AccShelfController extends BaseController {
 //                        return "该物料已在库位["+posName+"]中";
 //                        return "该物料已在库位["+posName+"]中";
                         Collection<DataLog> allTasks = taskService.getQueueTasks();
                         Collection<DataLog> allTasks = taskService.getQueueTasks();
                         for (DataLog task : allTasks) {
                         for (DataLog task : allTasks) {
-                            if(task.getCid().equals(cid) && task.getBarcode() != null && task.getBarcode().equals(barcode.getBarcode())){
+                            if(task.getBarcode() != null && task.getBarcode().equals(barcode.getBarcode())){
                                 taskService.addTaskToFinished(inPos,null,null);
                                 taskService.addTaskToFinished(inPos,null,null);
                                 opPosLight("close",storage,inPos,null);
                                 opPosLight("close",storage,inPos,null);
                                 return "OK"+getText("shelf.msg.outConfirm",new String[]{inPos.getPosName()},request.getLocale(),"出库完成, 库位["+inPos.getPosName()+"]灭灯");
                                 return "OK"+getText("shelf.msg.outConfirm",new String[]{inPos.getPosName()},request.getLocale(),"出库完成, 库位["+inPos.getPosName()+"]灭灯");

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

@@ -97,13 +97,13 @@ public class BoxChartController extends BaseController {
             }
             }
         }else{
         }else{
             storages.addAll(dataCache.getAllStorage().values());
             storages.addAll(dataCache.getAllStorage().values());
+        }
         storages.sort(new Comparator<Storage>() {
         storages.sort(new Comparator<Storage>() {
             @Override
             @Override
             public int compare(Storage o1, Storage o2) {
             public int compare(Storage o1, Storage o2) {
-                    return o1.getCid().compareTo(o2.getCid());
+                return o1.getName().compareTo(o2.getName());
             }
             }
         });
         });
-        }
         request.setAttribute("allStorage",storages);
         request.setAttribute("allStorage",storages);
             return "storage/allBoxView";
             return "storage/allBoxView";
 //        }
 //        }