zy-asrs-master.git

			@@ -20,10 +20,7 @@
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Optional;
			import java.util.*;

			@Component
			public class TaskWaveTimer {
			@@ -45,8 +42,13 @@
			@Autowired
			private DictService dictService;

			// @Scheduled(cron = "0/3 * * * * ? ")
			@Transactional
			/**
			* modifty：
			* original : fetch datasource of task type on WCS_EXECUTE_OUT_TASK_DONE
			* now: Fetch datasource of task type on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting the task type equal to GENERATE_WAVE_SEED
			*/
			@Scheduled(cron = "0/15 * * * * ? ")
			@Transactional(rollbackFor = Exception.class)
			public void taskWave() {
			InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
			try {
			@@ -58,90 +60,104 @@
			if (!autoCreateWaveSeed.equals("true")) {
			return;
			}
			//查询状态为RCS任务完成所有任务单据
			// List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
			List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id));
			HashSet<String> sycMatnrs = new HashSet<>();
			if (taskList.isEmpty()) {
			// throw new CoolException("没有可播种任务！！");
			} else {
			for (Task task : taskList) {
			Long hostId = task.getHostId();

			List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
			for (Task task : taskList) {
			Long hostId = task.getHostId();

			List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()).eq(TaskDetl::getHostId, hostId));
			if (taskDetls.isEmpty()) {
			continue;
			}

			for (TaskDetl taskDetl : taskDetls) {
			//分配订单
			Long waveId = taskDetl.getWaveId();
			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, waveId));
			if (list.isEmpty()) {
			List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()).eq(TaskDetl::getHostId, hostId));
			if (taskDetls.isEmpty()) {
			continue;
			}

			ArrayList<Long> orderIds = new ArrayList<>();
			for (Order order : list) {
			orderIds.add(order.getId());
			for (TaskDetl taskDetl : taskDetls) {
			//分配订单
			Long waveId = taskDetl.getWaveId();
			//同一个物料只添加一次播种任务
			if(sycMatnrs.contains(taskDetl.getMatnr())) {
			continue;
			}
			sycMatnrs.add(taskDetl.getMatnr());

			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, waveId));
			if (list.isEmpty()) {
			continue;
			}

			ArrayList<Long> orderIds = new ArrayList<>();
			for (Order order : list) {
			orderIds.add(order.getId());
			}

			String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
			List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
			.in(OrderDetl::getOrderId, orderIds)
			.eq(OrderDetl::getStockIndex, matUniqueKey)
			.eq(OrderDetl::getHostId, hostId));
			if(orderDetls.isEmpty()){
			throw new CoolException("订单明细不存在");
			}

			Double anfme = taskDetl.getAnfme();
			for (OrderDetl orderDetl : orderDetls) {
			//fixme 作业中数量调整放至，生成出库任务成功后
			double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
			if (issued <= 0.0D) { continue; }
			if (anfme <= 0.0D) { break; }

			double workQty = issued;
			if(anfme - issued < 0){
			workQty = anfme;
			}
			anfme -= workQty;

			orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
			//
			//fixme 生成波次播种数据时，不自动添加站点绑定，站点绑定调整至出库绑定播种库位时更新
			// CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
			// if (cacheSite == null) {
			// throw new CoolException("缓存站空间不存在");
			// }

			WaveSeed waveSeed = new WaveSeed();
			// waveSeed.setSiteId(cacheSite.getId());
			// waveSeed.setSiteNo(cacheSite.getSiteNo());
			waveSeed.setOrderNo(orderDetl.getOrderNo());
			waveSeed.setOrderId(orderDetl.getOrderId());
			waveSeed.setOrderDetlId(orderDetl.getId());
			waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
			waveSeed.setTaskDetlId(taskDetl.getId());
			//为满足当前需求，经确认，改成订单数量
			waveSeed.setAnfme(orderDetl.getAnfme());
			waveSeed.setWorkQty(0D);
			waveSeed.setMatnr(taskDetl.getMatnr());
			waveSeed.setBatch(taskDetl.getBatch());
			waveSeed.setFieldParams(JSON.toJSONString(taskDetl.getUniqueField()));
			waveSeed.setHostId(hostId);
			if (!waveSeedService.save(waveSeed)) {
			throw new CoolException("波次播种创建失败");
			}
			// cacheSite.setOrderId(orderDetl.getOrderId());
			// cacheSite.setOrderNo(orderDetl.getOrderNo());
			// cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
			// cacheSite.setUpdateTime(new Date());
			// if (!cacheSiteService.updateById(cacheSite)) {
			// throw new CoolException("缓存站更新失败");
			// }

			}
			}

			String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
			List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
			.in(OrderDetl::getOrderId, orderIds)
			.eq(OrderDetl::getStockIndex, matUniqueKey)
			.eq(OrderDetl::getHostId, hostId));
			if(orderDetls.isEmpty()){
			throw new CoolException("订单明细不存在");
			task.setTaskSts(TaskStsType.GENERATE_WAVE_SEED.id);
			task.setUpdateTime(new Date());
			if (!taskService.updateById(task)) {
			throw new CoolException("任务更新失败");
			}

			Double anfme = taskDetl.getAnfme();
			for (OrderDetl orderDetl : orderDetls) {
			double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
			if (issued <= 0.0D) { continue; }
			if (anfme <= 0.0D) { break; }

			double workQty = issued;
			if(anfme - issued < 0){
			workQty = anfme;
			}
			anfme -= workQty;

			orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);

			CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
			if (cacheSite == null) {
			throw new CoolException("缓存站空间不存在");
			}

			WaveSeed waveSeed = new WaveSeed();
			waveSeed.setSiteId(cacheSite.getId());
			waveSeed.setSiteNo(cacheSite.getSiteNo());
			waveSeed.setOrderNo(orderDetl.getOrderNo());
			waveSeed.setOrderId(orderDetl.getOrderId());
			waveSeed.setOrderDetlId(orderDetl.getId());
			waveSeed.setTaskDetlId(taskDetl.getId());
			waveSeed.setAnfme(taskDetl.getAnfme());
			waveSeed.setWorkQty(0D);
			waveSeed.setMatnr(taskDetl.getMatnr());
			waveSeed.setBatch(taskDetl.getBatch());
			waveSeed.setFieldParams(JSON.toJSONString(taskDetl.getUniqueField()));
			waveSeed.setHostId(hostId);
			if (!waveSeedService.save(waveSeed)) {
			throw new CoolException("波次播种创建失败");
			}

			cacheSite.setOrderId(orderDetl.getOrderId());
			cacheSite.setOrderNo(orderDetl.getOrderNo());
			cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
			cacheSite.setUpdateTime(new Date());
			if (!cacheSiteService.updateById(cacheSite)) {
			throw new CoolException("缓存站更新失败");
			}

			}

			}

			task.setTaskSts(TaskStsType.COMPLETE_OUT.id);
			task.setUpdateTime(new Date());
			if (!taskService.updateById(task)) {
			throw new CoolException("任务更新失败");
			}
			}
			} catch (Exception e) {