pjb
2025-06-22 af082a3f27b88bb7afbe73ffe38c7fa5091ee841
大屏显示优化
4个文件已修改
17 ■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -116,11 +116,10 @@
        Map<String, Object> param = new HashMap<>();
        param.put("taskNo", task.getTaskNo());
        param.put("siteNo", cacheSite.getSiteNo());
        param.put("orderNo",cacheSite.getOrderNo());
        wcsApiService.slapLightLogic(param);
        return R.ok();
       return wcsApiService.slapLightLogic(param);
    }
    /**
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -347,7 +347,7 @@
    public R slapLightLogic(Map<String, Object> request) {
        String taskNo = request.get("taskNo").toString();
        String orderNo = request.get("orderNo").toString();
        String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString();
        List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
        if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {
            throw new CoolException("请打印明细,并绑定目标集货区");
@@ -376,9 +376,10 @@
//            }).collect(Collectors.toList());
            //判断数量是否与订单明细的需求量相同,相同则订单完成
            if (one.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {
                //播种完成,释放绑定站点
                List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
                    .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo)
                    .eq(CacheSite::getOrderNo, orderNo));
                for (CacheSite cacheSite : cacheSites) {
                    if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
                        cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
@@ -390,7 +391,6 @@
                        cacheSite.setUpdateTime(new Date());
                        if (!cacheSiteService.updateById(cacheSite)) {
                            throw new CoolException("播种站点更新失败");
                        }
                    }
                }
            }
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -172,7 +172,7 @@
     * @description: 出库任务完成
     * @version 1.0
     */
    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/35 * * * * ? ")
    @Transactional(rollbackFor = Exception.class)
    public void outExecute() {
        InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -65,7 +65,7 @@
    @Scheduled(cron = "0/30 * * * * ? ")
    @Transactional(rollbackFor = Exception.class)
    public void addWaveHistories() {
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id));
        if (tasks.isEmpty()) {
            return;
        }