uid查询页面，如果是麦康尼料仓，库位号显示cid

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

@@ -417,6 +417,15 @@ public class StoragePosController {
             Storage storage=dataCache.getStorageById(StoragePosDtos.get(i).getStorageId());
             Storage storage=dataCache.getStorageById(StoragePosDtos.get(i).getStorageId());
             if(storage!=null){
             if(storage!=null){
                 StoragePosDtos.get(i).setStorageName(storage.getName());
                 StoragePosDtos.get(i).setStorageName(storage.getName());
+                StoragePosDtos.get(i).setCid(storage.getCid());
+
+                if(storage.isTHIRDBox()){
+                    StoragePosDtos.get(i).setPosName(storage.getCid());
+                    if(StoragePosDtos.get(i).getBarcode()!=null){
+                        StoragePosDtos.get(i).getBarcode().setPosName(storage.getCid());
+                    }
+                }
+
             }
             }
         }
         }
         return new PageData(StoragePosDtos, pages.getTotalElements());
         return new PageData(StoragePosDtos, pages.getTotalElements());

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

@@ -78,5 +78,7 @@ public class StoragePosDto implements Serializable {
     @ApiModelProperty("组名称")
     @ApiModelProperty("组名称")
     private String groupName = "";
     private String groupName = "";
 
 
+    @ApiModelProperty("cid")
+    private String cid;
 
 
 }
 }

src/main/resources/messages_en_US.properties

@@ -342,7 +342,7 @@ smfcore.updatePass.hasNoAccess=No operating rights
 smfcore.selfAudit.noPos=Self Audit{0}No depot number found
 smfcore.selfAudit.noPos=Self Audit{0}No depot number found
 smfcore.task.updatePutInFail=Cannot update the status of the inbound task {0}[{1}] to {2}
 smfcore.task.updatePutInFail=Cannot update the status of the inbound task {0}[{1}] to {2}
 smfcore.saveOk=save successfully
 smfcore.saveOk=save successfully
-smfcore.lockMaterials=Locking Materials
+smfcore.lockMaterials=Block Materials
 smfcore.emptyOut.fail=Task [{0}] empty processing failure:{1}
 smfcore.emptyOut.fail=Task [{0}] empty processing failure:{1}
 smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0}
 smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0}
 smfcore.device.formatError= Format error
 smfcore.device.formatError= Format error
\ No newline at end of file