工单号SO改为WO.新增料仓接口。

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

@@ -89,31 +89,59 @@ public class StorageController {
         Query query= QueryHelp.getQuery(criteria);
         PageData<Storage> pages=storageManager.findByPage(query,pageable);
         List<StorageDto> StorageDtos=storageMapper.toDto(pages.getContent());
-        for (int i=0;i<StorageDtos.size();i++) {
+        StorageDtos=updateDtos(StorageDtos);
+//        for (int i=0;i<StorageDtos.size();i++) {
+//            String groupId = "";
+//            if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) {
+//                groupId = StorageDtos.get(i).getGroupId();
+//            }
+//            Group group = groupManager.get(groupId);
+//            if (group != null) {
+//                StorageDtos.get(i).setGroupName(group.getGroupName());
+//            } else {
+//                //此料仓未分组
+//                StorageDtos.get(i).setGroupName("");
+//                if (!StorageDtos.get(i).getGroupId().equals("")) {
+//                    storageManager.updateStorageGroup(StorageDtos.get(i).getId(), "");
+//                    log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空");
+//                }
+//
+//            }
+//            //获取设备状态，设置状态和当前任务信息
+//            StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
+//            if (bean != null && bean.getBoxStatus() != null) {
+//                StorageDtos.get(i).setClientIp(bean.getClientIp());
+//            }
+//        }
+        return new PageData(StorageDtos,pages.getTotalElements());
+    }
+    private List<StorageDto> updateDtos(List<StorageDto> dtoList){
+        for (int i=0;i<dtoList.size();i++) {
             String groupId = "";
-            if (StorageDtos.get(i).getGroupId() != null && (!StorageDtos.get(i).getGroupId().isEmpty())) {
-                groupId = StorageDtos.get(i).getGroupId();
+            if (dtoList.get(i).getGroupId() != null && (!dtoList.get(i).getGroupId().isEmpty())) {
+                groupId = dtoList.get(i).getGroupId();
             }
             Group group = groupManager.get(groupId);
             if (group != null) {
-                StorageDtos.get(i).setGroupName(group.getGroupName());
+                dtoList.get(i).setGroupName(group.getGroupName());
             } else {
                 //此料仓未分组
-                StorageDtos.get(i).setGroupName("");
-                if (!StorageDtos.get(i).getGroupId().equals("")) {
-                    storageManager.updateStorageGroup(StorageDtos.get(i).getId(), "");
-                    log.info("料仓[" + StorageDtos.get(i).getId() + "][" + StorageDtos.get(i).getName() + "]的组不存在，修改组为空");
+                dtoList.get(i).setGroupName("");
+                if (!dtoList.get(i).getGroupId().equals("")) {
+                    storageManager.updateStorageGroup(dtoList.get(i).getId(), "");
+                    log.info("料仓[" + dtoList.get(i).getId() + "][" + dtoList.get(i).getName() + "]的组不存在，修改组为空");
                 }
 
             }
             //获取设备状态，设置状态和当前任务信息
-            StatusBean bean = DevicesStatusUtil.getStatusBean(StorageDtos.get(i).getCid());
+            StatusBean bean = DevicesStatusUtil.getStatusBean(dtoList.get(i).getCid());
             if (bean != null && bean.getBoxStatus() != null) {
-                StorageDtos.get(i).setClientIp(bean.getClientIp());
+                dtoList.get(i).setClientIp(bean.getClientIp());
             }
         }
-        return new PageData(StorageDtos,pages.getTotalElements());
+        return dtoList;
     }
+
     @ApiOperation("根据组权限返回所有料仓")
     @GetMapping(value = "/all")
 //    @PreAuthorize("@el.check('storage:list')")
@@ -143,6 +171,38 @@ public class StorageController {
         return storageSearchDtos;
     }
 
+    @ApiOperation("物料入库界面，返回所有料仓")
+    @GetMapping(value = "/allList")
+    public List<StorageDto> all() {
+        List<Storage> storages=storageManager.findAll();
+        List<StorageDto> storageDtos=storageMapper.toDto(storages);
+        storageDtos=updateDtos(storageDtos);
+        return storageDtos;
+    }
+    @ApiOperation("料架设置界面，返回所有的料架列表")
+    @GetMapping(value = "/allShelf")
+    public List<StorageDto> allShelf() {
+        Query query=new Query(Criteria.where("type").in(new String[]{DeviceType.NLP.name(),DeviceType.NL.name() }));
+        List<Storage> storages=storageManager.findByQuery(query);
+        List<StorageDto> storageDtos= new ArrayList<>();
+        for (Storage storage :
+                storages) {
+            StorageDto dto=new StorageDto();
+            dto.setName(storage.getName());
+            dto.setId(storage.getId());
+            dto.setCid(storage.getCid());
+            //获取设备状态，设置状态和当前任务信息
+            StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
+            if (bean != null && bean.getBoxStatus() != null) {
+                dto.setClientIp(bean.getClientIp());
+                String url="http://"+bean.getClientIp()+":5000/";
+                dto.setClientUrl(url);
+            }
+            storageDtos.add(dto);
+        }
+        return storageDtos;
+    }
+
     @ApiOperation("返回所有料仓类型")
     @GetMapping(value = "/typeList")
     public List<String> typeList() {
@@ -373,44 +433,11 @@ public class StorageController {
 //            StoragePos posInfo = storagePosManager.getByPosName(posName);
             StoragePos posInfo =findFormList(storagePosList,posName);
             if(posInfo == null){
-                posInfo = new StoragePos();
-                posInfo.setPosName(posName);
-                posInfo.setStorageId(storageId);
-                posInfo.setH(height);
-                posInfo.setW(width);
-                posInfo.setPriority(priority);
-                Point point= PointUtil.getPosPoint(posName);
-                posInfo.setCoordinate(new double[]{point.getX(),point.getY()});
+                posInfo = new StoragePos(storageId,posName,height,width,priority);
                 newRowCount++;
                 newList.add(posInfo);
             }else{
-                boolean needUpdate=false;
-                if(!posInfo.getPosName().equals(posName)){
-                    needUpdate=true;
-                    posInfo.setPosName(posName);
-                }
-                if(!posInfo.getStorageId().equals(storageId)){
-                    needUpdate=true;
-                    posInfo.setStorageId(storageId);
-                }
-                if(posInfo.getH()!=height){
-                    needUpdate=true;
-                    posInfo.setH(height);
-                }
-                if(posInfo.getW()!=width){
-                    needUpdate=true;
-                    posInfo.setW(width);
-                }
-                if(posInfo.getPriority()!=priority){
-                    needUpdate=true;
-                    posInfo.setPriority(priority);
-                }
-                Point point= PointUtil.getPosPoint(posInfo.getPosName());
-                if(posInfo.getCoordinate()==null||posInfo.getCoordinate().length!=2||
-                        (posInfo.getCoordinate()[0]!=point.getX()) ||(posInfo.getCoordinate()[1]!=point.getY())){
-                    needUpdate=true;
-                    posInfo.setCoordinate(new double[]{point.getX(),point.getY()});
-                }
+                boolean needUpdate=posInfo.updatePosInfo(storageId,posName,height,width,priority);
                 if(needUpdate){
                     updateRowCount++;
                     storagePosManager.save(posInfo);

src/main/java/com/neotel/smfcore/core/storage/rest/dto/StorageDto.java

@@ -62,4 +62,7 @@ public class StorageDto implements Serializable {
     @ApiModelProperty("客户端IP")
     private String clientIp;
 
+    @ApiModelProperty("客户端地址")
+    private String clientUrl;
+
 }

src/main/java/com/neotel/smfcore/core/system/bean/OrderSetting.java

@@ -21,7 +21,7 @@ public class OrderSetting implements Serializable {
 
     public String ri="RI";
 
-    public String so="SO";
+    public String so="WO";
 
     /**
      * 是否显示料架亮灯方式

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -193,14 +193,14 @@ public class SettingsController {
                     map.put(orderSetting.getFeeder(),"Feeder1"+i);
                     map.put(orderSetting.getQty(),"100"+i);
                     map.put(orderSetting.getRi(),"");
-                    map.put(orderSetting.getSo(),"SO1001" );
+                    map.put(orderSetting.getSo(),"WO1001" );
                 }
                 else{
                     map.put(orderSetting.getPn(),"PN2"+i);
                     map.put(orderSetting.getFeeder(),"Feeder2"+i);
                     map.put(orderSetting.getQty(),"200"+i);
                     map.put(orderSetting.getRi(),"");
-                    map.put(orderSetting.getSo(),"SO1002" );
+                    map.put(orderSetting.getSo(),"WO1002" );
                 }
                 maps.add(map);
             }