zy-asrs-master.git

			@@ -48,6 +48,13 @@
			@Autowired
			private WaveService waveService;


			/**
			* @author Ryan
			* @date 2025/6/20
			* @description: 入库任务已完成
			* @version 1.0
			*/
			@Scheduled(cron = "0/15 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void inExecute() {
			@@ -73,61 +80,37 @@

			if (taskDetls.isEmpty()) {
			throw new CoolException("任务明细不存在");
			} else { //XXX 先更新订单，后删除任务明细
			if (task.getTaskType() == 53L) {
			List<Long> waveIds = taskDetls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
			List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
			orders.forEach(order -> {

			});
			} else {

			}



			} else {
			//任务类型为53，根据WaveId修改订单明细
			for (TaskDetl taskDetl : taskDetls) {
			if (task.getTaskType() == 53L) {
			List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, taskDetl.getWaveId()));
			orders.forEach(order -> {
			List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
			if (!detls.isEmpty()) {
			detls.forEach(detl -> {
			detl.setWorkQty(detl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少
			detl.setQty(detl.getQty() + taskDetl.getAnfme());//已完成数量增加
			detl.setUpdateTime(new Date());
			});
			}
			});
			} else {
			if (taskDetl.getDetlId() == null) {
			continue;
			if (taskDetl.getDetlId() == null) {
			continue;
			}
			OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());
			if (orderDetl == null) {
			throw new CoolException("订单明细不存在");
			}
			orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少
			orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加
			orderDetl.setUpdateTime(new Date());
			if (!orderDetlService.updateById(orderDetl)) {
			throw new CoolException("更新订单明细失败");
			}
			//检测订单是否完成
			boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());

			if (checkOrderComplete) {
			//订单已经完成
			Order order = orderService.getById(orderDetl.getOrderId());
			if (order == null) {
			throw new CoolException("订单不存在");
			}
			OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());
			if (orderDetl == null) {
			throw new CoolException("订单明细不存在");
			order.setOrderSettle(OrderSettleType.COMPLETE.val());
			order.setUpdateTime(new Date());
			if (!orderService.updateById(order)) {
			throw new CoolException("订单更新失败");
			}
			orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//工作中数量减少
			orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//已完成数量增加
			orderDetl.setUpdateTime(new Date());
			if (!orderDetlService.updateById(orderDetl)) {
			throw new CoolException("更新订单明细失败");
			}
			//检测订单是否完成
			boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());
			if (checkOrderComplete) {
			//订单已经完成
			Order order = orderService.getById(orderDetl.getOrderId());
			if (order == null) {
			throw new CoolException("订单不存在");
			}
			order.setOrderSettle(OrderSettleType.COMPLETE.val());
			order.setUpdateTime(new Date());
			if (!orderService.updateById(order)) {
			throw new CoolException("订单更新失败");
			}
			}

			}
			}
			}
			@@ -182,6 +165,13 @@
			}
			}


			/**
			* @author Ryan
			* @date 2025/6/20
			* @description: 出库任务完成
			* @version 1.0
			*/
			@Scheduled(cron = "0/10 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void outExecute() {
			@@ -190,55 +180,39 @@
			//获取出库完成任务
			List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
			.eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id)
			.in(Task::getTaskType, 101, 53, 57));
			.ge(Task::getTaskType, 101));
			if (list.isEmpty()) {
			return;
			}

			Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));
			if(dict == null) {
			return;
			}
			for (Task task : list) {
			int diff = DateUtils.diff(task.getCreateTime(), new Date());
			int taskLogDiffDays = Integer.parseInt(dict.getValue());
			if (diff < taskLogDiffDays) {
			continue;
			}

			Long hostId = task.getHostId();

			//保存任务明细历史档
			List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
			if (taskDetls.isEmpty()) {
			throw new CoolException("任务明细不存在");
			}

			boolean flag = false;
			for (TaskDetl taskDetl : taskDetls) {
			if (taskDetl.getWaveId() == null) {
			continue;
			}

			Wave wave = waveService.getById(taskDetl.getWaveId());
			if (wave != null) {
			flag = true;//波次未完成
			break;
			}
			}

			if (flag) {
			continue;
			}


			//保存任务历史档
			TaskLog taskLog = new TaskLog();
			taskLog.sync(task);
			taskLog.setId(null);
			if (!taskLogService.save(taskLog)) {
			throw new CoolException("保存任务历史档失败");
			} else { //fixme 历史任务档保存后，修改订单状态信息后，再删除任务档
			} else {
			//更新订单信息
			taskDetls.forEach(taskDetl -> {
			if (taskDetl.getDetlId() != null) {