wms-master.git - Gitblit

			@@ -6,6 +6,7 @@
			import com.vincent.rsf.framework.common.Cools;
			import com.vincent.rsf.framework.common.R;
			import com.vincent.rsf.framework.exception.CoolException;
			import com.vincent.rsf.server.common.constant.Constants;
			import com.vincent.rsf.server.manager.entity.*;
			import com.vincent.rsf.server.manager.enums.*;
			import com.vincent.rsf.server.common.utils.ExcelUtil;
			@@ -137,7 +138,7 @@
			.in(Task::getTaskStatus, longs));

			for (Task task : tasks) {
			task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
			task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
			}
			if (!taskService.updateBatchById(tasks)) {
			return R.error("完成任务失败");
			@@ -147,8 +148,7 @@
			}

			/**
			* 拣料出库
			*
			* 拣料出库（用于测试拣料出库）
			* @return
			*/
			@PreAuthorize("hasAuthority('manager:task:update')")
			@@ -159,26 +159,26 @@
			throw new CoolException("能数不能为空！！");
			}
			try {
			return R.ok(taskService.pickOrCheckTask(id, "pick"));
			return R.ok("出库完成").add(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK));
			} catch (Exception e) {
			throw new CoolException(e.getMessage());
			}
			}

			/**
			* 盘点出库
			* 盘点出库（用于测试盘点出库）
			*
			* @return
			*/
			@PreAuthorize("hasAuthority('manager:task:update')")
			@ApiOperation("拣料出库")
			@ApiOperation("盘点出库")
			@PostMapping("/task/check/{id}")
			public R checkTask(@PathVariable Long id) {
			if (Objects.isNull(id)) {
			throw new CoolException("能数不能为空！！");
			}
			try {
			return R.ok(taskService.pickOrCheckTask(id, "check"));
			return R.ok(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_CHECK));
			} catch (Exception e) {
			throw new CoolException(e.getMessage());
			}