pjb
2025-03-08 83b51a5a0774ea8ecb9a06304af3b956a21307c8
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -44,8 +44,8 @@
    /**
     * modifty:
     * original : fetch datasource of task type on WAVE_SEED
     * now: Fetch datasource of task type  on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting  the task type equal to WAVE_SEED
     * 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)
@@ -60,7 +60,7 @@
            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<>();
@@ -117,15 +117,16 @@
                            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("缓存站空间不存在");
                            }
//
                            //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.setSiteId(cacheSite.getId());
//                            waveSeed.setSiteNo(cacheSite.getSiteNo());
                            waveSeed.setOrderNo(orderDetl.getOrderNo());
                            waveSeed.setOrderId(orderDetl.getOrderId());
                            waveSeed.setOrderDetlId(orderDetl.getId());
@@ -141,13 +142,13 @@
                            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("缓存站更新失败");
                            }
//                            cacheSite.setOrderId(orderDetl.getOrderId());
//                            cacheSite.setOrderNo(orderDetl.getOrderNo());
//                            cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
//                            cacheSite.setUpdateTime(new Date());
//                            if (!cacheSiteService.updateById(cacheSite)) {
//                                throw new CoolException("缓存站更新失败");
//                            }
                        }
                    }