1.物料流到皮带线上解除禁用库位

2.禁用记录报表优化

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -566,12 +566,11 @@ public class DeviceController {
         pos.setMsg(msg);
         pos.setMsg(msg);
         storagePosManager.save(pos);
         storagePosManager.save(pos);
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
-
-        storagePosUsageRecordService.save(pos.getPosName(),msg);
-
-        DeviceMessageUtil.addEnabledPosMessage(pos,"");
+        //storagePosUsageRecordService.save(pos.getPosName(), "屏蔽库位:" + msg);
+        DeviceMessageUtil.addEnabledPosMessage(pos, "");
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
+
     @ApiOperation("客户端判断CID是否存在")
     @ApiOperation("客户端判断CID是否存在")
     @RequestMapping(value = "/service/store/cidIsExists")
     @RequestMapping(value = "/service/store/cidIsExists")
     @ResponseBody
     @ResponseBody

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -116,7 +116,6 @@ public class InnerBoxRestController {
         if (barcode != null) {
         if (barcode != null) {
             code = barcode.getBarcode();
             code = barcode.getBarcode();
         }
         }
-
         //获取到当前执行的任务
         //获取到当前执行的任务
         DataLog opTask = null;
         DataLog opTask = null;
         Collection<DataLog> allTasks = taskService.getAllTasks();
         Collection<DataLog> allTasks = taskService.getAllTasks();
@@ -129,33 +128,6 @@ public class InnerBoxRestController {
                 }
                 }
             }
             }
         }
         }
-
-        //如果任务不存在,则把库位信息给清空,库位解除禁用
-        if (opTask == null) {
-            StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
-            if (pos != null) {
-                barcode = pos.getBarcode();
-                if (!pos.isEnabled()){
-                    pos.setEnabled(true);
-                }
-                pos.setBarcode(null);
-                pos.setUsed(false);
-                storagePosManager.save(pos);
-                barcode.setPosName("");
-                barcode.setUsed(true);
-                barcode.setUsedDate(new Date());
-                barcode.setCheckOutDate(new Date(), "");
-                barcode.setPosName("");
-                barcodeManager.save(barcode);
-                dataCache.updateInventory(pos,barcode);
-                Storage storage = dataCache.getStorageById(pos.getStorageId());
-                dataCache.reloadStorage(storage,storage.getCid());
-                //添加一条message
-                DeviceMessageUtil.addEnabledPosMessage(pos,"启用库位,清空库存");
-                storagePosUsageRecordService.save(pos.getPosName(),"启用库位,清空库存");
-            }
-        }
-
         if (opTask == null) {
         if (opTask == null) {
             return ResultBean.newErrorResult(303, "smfcore.task.notExist", "任务不存在");
             return ResultBean.newErrorResult(303, "smfcore.task.notExist", "任务不存在");
         }
         }
@@ -296,9 +268,46 @@ public class InnerBoxRestController {
             return resultMap;
             return resultMap;
         }
         }
 
 
+        //获取到当前执行的任务
+        DataLog opTask = null;
+        Collection<DataLog> allTasks = taskService.getAllTasks();
+        //log.info("所有任务为："+ JSON.toJSONString(allTasks));
+        for (DataLog task : allTasks) {
+            if (task.isCheckOutTask() && reBarcode.getBarcode().equals(task.getBarcode())) {
+                if (!task.isCancel() && !task.isFinished()) {
+                    opTask = task;
+                    break;
+                }
+            }
+        }
+
+        //如果任务不存在,则把库位信息给清空,库位解除禁用
+        if (opTask == null) {
+            StoragePos pos = storagePosManager.getByBarcode(reBarcode.getBarcode());
+            if (pos != null) {
+                reBarcode = pos.getBarcode();
+                if (!pos.isEnabled()) {
+                    pos.setEnabled(true);
+                }
+                pos.setBarcode(null);
+                pos.setUsed(false);
+                storagePosManager.save(pos);
+                reBarcode.setPosName("");
+                reBarcode.setUsed(true);
+                reBarcode.setUsedDate(new Date());
+                reBarcode.setCheckOutDate(new Date(), "");
+                reBarcode.setPosName("");
+                barcodeManager.save(reBarcode);
+                dataCache.updateInventory(pos, reBarcode);
+                Storage storage = dataCache.getStorageById(pos.getStorageId());
+                dataCache.reloadStorage(storage, storage.getCid());
+                //添加一条message
+                DeviceMessageUtil.addEnabledPosMessage(pos, "启用库位,清空库存");
+                storagePosUsageRecordService.save(pos.getPosName(), "启用库位,清空库存");
+            }
+        }
 
 
         if (reBarcode != null) {
         if (reBarcode != null) {
-            List<DataLog> allTasks = taskService.getAllTasks();
             for (DataLog dataLog : allTasks) {
             for (DataLog dataLog : allTasks) {
                 if (dataLog.isCheckOutTask() && dataLog.getBarcode().equals(reBarcode.getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()) {
                 if (dataLog.isCheckOutTask() && dataLog.getBarcode().equals(reBarcode.getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()) {
                     resultMap.put("cid", dataLog.getCid());
                     resultMap.put("cid", dataLog.getCid());