物料标签bug修改

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

@@ -87,7 +87,7 @@ public class LabelController {
             }
             }
 
 
             //查找组下是否有设备
             //查找组下是否有设备
-            Query query = new Query(Criteria.where("labelId").is(id));
+            Query query = new Query(Criteria.where("labelId").is(id).and("used").is(true));
             List<StoragePos> storagePosList = storagePosManager.findByQuery(query);
             List<StoragePos> storagePosList = storagePosManager.findByQuery(query);
             if (storagePosList != null && storagePosList.size() >= 1) {
             if (storagePosList != null && storagePosList.size() >= 1) {
                 throw new ValidateException("smfcore.labelWithStoragePos","标签[{0}]已和库位关联",new String[]{label.getLabelName()});
                 throw new ValidateException("smfcore.labelWithStoragePos","标签[{0}]已和库位关联",new String[]{label.getLabelName()});

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

@@ -393,6 +393,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     public void clearStoragePosLabel(String labelId) {
     public void clearStoragePosLabel(String labelId) {
         Query query = new Query(Criteria.where("labelId").is(labelId));
         Query query = new Query(Criteria.where("labelId").is(labelId));
         storagePosDao.updateMulti(query, Update.update("labelId",""));
         storagePosDao.updateMulti(query, Update.update("labelId",""));
+        storagePosDao.updateMulti(query, Update.update("labelName",""));
     }
     }
 
 
     @Override
     @Override

src/main/java/com/neotel/smfcore/core/storage/service/po/StoragePos.java

@@ -101,6 +101,15 @@ public class StoragePos extends BasePo implements Serializable {
         return used;
         return used;
     }
     }
 
 
+    public void setUsed(boolean value){
+        this.used=value;
+        if(!used){
+            //清空标签
+            labelId="";
+            labelName="";
+        }
+    }
+
 
 
 
 
     public boolean isLocked(){
     public boolean isLocked(){