入库bug修改

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -17,10 +17,11 @@ import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.hik.bean.ShelfPosInfo;
 import com.neotel.smfcore.core.inList.util.InListCache;
 import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
-import com.neotel.smfcore.core.kanban.rest.bean.dto.GroupStatusDto;
 import com.neotel.smfcore.core.storage.bean.UsageItem;
 import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
+import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
@@ -70,6 +71,9 @@ public class SingleInController {
     @Autowired
     private InListCache inListCache;
 
+    @Autowired
+    private IStoragePosManager storagePosManager;
+
 
     @ApiOperation("输入二维码后根据尺寸获取料架列表")
     @GetMapping("/shelfPosList")
@@ -190,8 +194,11 @@ public class SingleInController {
 
         Barcode barcode = resolveBarcode(code);
 
+        StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
+        if (pos != null) {
+            throw new ValidateException("smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{pos.getPosName()});
+        }
         //判断料架是否有空位
-
         for (UsageItem item :
                 storage.getUsageMap().values()) {
             if (item.getH() == barcode.getHeight() && item.getW() == barcode.getPlateSize()) {