zy-asrs-master.git

			@@ -1,6 +1,7 @@
			package com.zy.asrs.wms.asrs.timer;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
			import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
			import com.zy.asrs.framework.exception.CoolException;
			@@ -8,15 +9,21 @@
			import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
			import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
			import com.zy.asrs.wms.asrs.service.*;
			import io.jsonwebtoken.lang.Collections;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.util.Collection;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			@Slf4j
			@Component
			public class TaskTimer {

			@@ -56,9 +63,12 @@
			@Autowired
			private OrderDetlService orderDetlService;

			@Autowired
			private CacheSiteService cacheSiteService;

			// @Scheduled(cron = "0/3 * * * * ? ")
			@Transactional

			@Scheduled(cron = "0/3 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void inExecute() {
			InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
			try {
			@@ -98,8 +108,30 @@
			}
			}

			// @Scheduled(cron = "0/3 * * * * ? ")
			@Transactional

			/**
			* 1. 定时拉取需要执行回库任务列表数据，
			* 2. 删除原始库位明细，原始库位状态置成O.空库
			* 3.
			*/
			@Scheduled(cron = "0/3 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void rollbackStock() {
			//获取需要执行回库的任务，更新库存信息
			List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskType, 53).eq(Task::getTaskSts, TaskStsType.WCS_CONVEYOR_START.id));
			if (tasks.isEmpty()) {
			return;
			}
			tasks.forEach(task -> {
			//删除原始库位明细，状态置为O.空库
			executeTask103(task);
			});
			//todo 需添加一个任务状态或临时状态，否则会一直轮循，程序报错（库位状态不处于R.出库预约）
			}


			@Scheduled(cron = "0/10 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void outExecute() {
			InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
			try {
			@@ -111,7 +143,7 @@
			for (Task task : list) {
			//同步数据
			switch (task.getTaskType().intValue()) {
			case 101://出库
			case 101://出库xx
			executeTask101(task);
			break;
			case 103://拣料
			@@ -120,13 +152,11 @@
			default:
			throw new CoolException("未知任务类型");
			}

			task.setTaskSts(TaskStsType.UPDATED_OUT.id);//200.库存更新完成
			if (!taskService.updateById(task)) {
			throw new CoolException("库存更新失败");
			}
			}

			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			@@ -138,7 +168,6 @@
			//入库
			private void executeTask1(Task task) {
			Long hostId = task.getHostId();

			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
			if (loc == null) {
			throw new CoolException("库位不存在");
			@@ -189,7 +218,6 @@
			}
			}
			}

			//组托通知档转历史档
			List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
			if (waitPakins.isEmpty()) {
			@@ -198,6 +226,7 @@
			for (WaitPakin waitPakin : waitPakins) {
			WaitPakinLog waitPakinLog = new WaitPakinLog();
			waitPakinLog.sync(waitPakin);
			waitPakinLog.setId(null);
			if (!waitPakinLogService.save(waitPakinLog)) {
			throw new CoolException("组托通知档转历史档失败");
			}
			@@ -289,11 +318,16 @@

			}

			/**
			* 拣料再入库，根据任务目标库位，生成新库存信息
			* @param task
			*/
			//拣料再入库
			private void executeTask53(Task task) {
			Long hostId = task.getHostId();

			//fixme 将任务当前
			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
			// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
			if (loc == null) {
			throw new CoolException("库位不存在");
			}
			@@ -353,7 +387,8 @@
			//出库
			private void executeTask101(Task task) {
			Long hostId = task.getHostId();
			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
			// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()));
			if (loc == null) {
			throw new CoolException("库位不存在");
			}
			@@ -388,7 +423,9 @@
			//拣料出库
			private void executeTask103(Task task) {
			Long hostId = task.getHostId();
			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
			//FIXME 暂时注释HOSTID筛选条件
			// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()).eq(Loc::getHostId, hostId));
			Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getOriginLoc()));
			if (loc == null) {
			throw new CoolException("库位不存在");
			}
			@@ -405,6 +442,7 @@
			if (!locService.updateById(loc)) {
			throw new CoolException("库位状态更新失败");
			}

			List<LocDetl> detlList = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()).eq(LocDetl::getHostId, hostId));
			//删除库存明细
			for (LocDetl locDetl : detlList) {