全部出库 修改

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

@@ -10,24 +10,22 @@ import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
-import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.bean.PosInfo;
 import com.neotel.smfcore.core.device.bean.PosInfo;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.handler.IDeviceHandler;
+import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
+import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 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.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
 import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
 import com.neotel.smfcore.core.system.service.po.AlarmInfo;
 import com.neotel.smfcore.core.system.service.po.AlarmInfo;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 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;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
-import com.neotel.smfcore.core.storage.enums.DeviceType;
-import com.neotel.smfcore.core.device.handler.IDeviceHandler;
-import com.neotel.smfcore.core.device.bean.StatusBean;
-import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.core.storage.service.po.Storage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -482,12 +480,12 @@ public class DeviceController {
     @RequestMapping(value = "/service/store/outAll")
     @RequestMapping(value = "/service/store/outAll")
     @ResponseBody
     @ResponseBody
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean outAll(){
+    public ResultBean outAll() {
         //查找全部库位
         //查找全部库位
         List<StoragePos> storagePosList = storagePosManager.findNotEmpty();
         List<StoragePos> storagePosList = storagePosManager.findNotEmpty();
         //开始进行出库操作
         //开始进行出库操作
         for (StoragePos storagePos : storagePosList) {
         for (StoragePos storagePos : storagePosList) {
-            taskService.addTaskToFinished(storagePos,null, SecurityUtils.getCurrentUsername()+"outAll");
+            taskService.checkout(storagePos, false, null, false);
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }