no message

skyouc

8 小时以前 45b95bf88ab48e4b4db7ff9205e9afa2b83e8737

no message

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -222,8 +222,15 @@
        return mobileService.callAgvMove(params, getUserId());
    }

    /**
     * SO/EO入库
     * @author Ryan
     * @date 2026/4/3 14:53
     * @param params 
     * @return com.core.common.R
     */
    @PostMapping("/collection/agv/call")
    @ApiOperation("集货区入库")
    @ApiOperation("SO/EO入库")
    @ManagerAuth
    public R CollectionInCall(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -1510,6 +1510,9 @@
        }

        BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getTarSite()));
        if (Objects.isNull(basAreas)) {
            return R.error("站点不存在，请检查站点是否输入正确！！");
        }

        List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
                .in("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
@@ -1531,12 +1534,6 @@

    @Transactional(rollbackFor = Exception.class)
    public void generateSOEOInTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
        List<BasStationDetl> basStationDetls = basStationDetlService
                .selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", orgSite));
        if (Objects.isNull(basStationDetls) || basStationDetls.isEmpty()) {
            throw new CoolException("站点信息不存在！！");
        }

        List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
        if (!tasks.isEmpty()) {
            throw new CoolException("托盘已在任务执行中..");
@@ -1567,7 +1564,9 @@
            throw new CoolException("保存工作档失败");
        }

        for (BasStationDetl basStationDetl : basStationDetls) {
        List<BasStationDetl> basStationDetls = basStationDetlService
                .selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", orgSite));
        basStationDetls.forEach(basStationDetl -> {
            TaskDetl wrkDetl = new TaskDetl();
            BeanUtils.copyProperties(basStationDetl, wrkDetl);
            wrkDetl.setWrkNo(workNo)
@@ -1589,7 +1588,7 @@
            if (!taskDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
        }
        });

        // 修改目标库位状态
        if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
@@ -1603,22 +1602,18 @@
            throw new CoolException("移转失败，目标库位状态：" + loc.getLocSts$());
        }

        // 修改目标站点信息
        // 修改原站点信息
        BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
        if (Objects.isNull(station)) {
            throw new CoolException("站点不存在!!");
        }

        if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)) {
            station.setLocSts("R"); // S.入库预约
            station.setBarcode(barcode);
            station.setModiTime(new Date());
            station.setModiUser(userId);
            if (!basStationService.updateById(station)) {
                throw new CoolException("更新目标站点状态失败");
            }
        } else {
            throw new CoolException("移转失败，目标库位状态：" + station.getLocSts());
        station.setLocSts("R"); // S.入库预约
        station.setBarcode(barcode);
        station.setModiTime(new Date());
        station.setModiUser(userId);
        if (!basStationService.updateById(station)) {
            throw new CoolException("更新目标站点状态失败");
        }
    }

@@ -3056,15 +3051,18 @@
            if (Objects.isNull(combMat)) {
                continue;
            }
            OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", combMat.getOrderNo()));
            OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>()
                    .lt("settle", 4)
                    .eq("order_no", combMat.getOrderNo()));
            if (Objects.isNull(order)) {
                return R.error("为查询到订单，请确认是否为库口组托信息！！");
                return R.error("未查询到订单，请确认是否为库口组托信息！！");
            }
            //入库
            OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                    .eq("order_no", combMat.getOrderNo())
                    .eq("matnr", combMat.getMatnr())
                    .eq("supp_code", combMat.getStandby1()));
                    .eq("supp_code", combMat.getStandby1())
                    .last("AND anfme != qty"));

            if (!Objects.isNull(detlPakin)) {
                Double v = Math.round((detlPakin.getWorkQty() - combMat.getAnfme()) * 10000) / 10000.0;
@@ -3076,10 +3074,37 @@
                    throw new CoolException("订单明细更新失败！！");
                }

                if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("order_no", combMat.getOrderNo())
                BasStationDetl stationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
                        .eq("order_no", combMat.getOrderNo())
                        .eq("matnr", combMat.getMatnr())
                        .eq("supp_code", combMat.getStandby1()))) {
                    throw new CoolException("站点数据删除失败！！");
                        .eq("supp_code", combMat.getStandby1()));
                if (!Objects.isNull(stationDetl)) {
                    if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>()
                            .eq("order_no", combMat.getOrderNo())
                            .eq("matnr", combMat.getMatnr())
                            .eq("supp_code", combMat.getStandby1()))) {
                        throw new CoolException("解绑失败，站点库存删除失败！");
                    }
                }

                BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
                if (Objects.isNull(basAreas)) {
                    throw new CoolException("站点查询失败，请联系管理员！！");
                }

                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                        .eq("area_id", basAreas.getId())
                        .eq("order_no", combMat.getOrderNo())
                        .eq("matnr", combMat.getMatnr())
                        .eq("supp_code", combMat.getStandby1()));
                if (!Objects.isNull(locDetl)) {
                    if (!locDetlService.delete(new EntityWrapper<LocDetl>()
                            .eq("area_id", basAreas.getId())
                            .eq("order_no", combMat.getOrderNo())
                            .eq("matnr", combMat.getMatnr())
                            .eq("supp_code", combMat.getStandby1()))) {
                        throw new CoolException("解绑失败，缓冲库区库存删除失败！");
                    }
                }

                WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
@@ -3094,7 +3119,7 @@
                    }
                }
            } else {
                throw new CoolException("订单明细绑定关系不存在！！");
                throw new CoolException("订单明细绑定关系不存在或已完成入库！！");
            }
        }
        return R.ok();