lsh#

1

2 天以前 664df6de041aeab4341f739372f64ac9e428aad2

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -509,11 +509,11 @@
            throw new CoolException("参数不能为空！！");
        }

        DeviceSite deviceSite = deviceSiteService.getById(waitPakin.getSiteId());
        if (Objects.isNull(deviceSite)) {
        BasStation basStation = basStationService.getById(waitPakin.getSiteId());
        if (Objects.isNull(basStation)) {
            throw new CoolException("站点不存在！！");
        }
        DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(deviceSite.getSite()));
        DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(basStation.getStationName()));
        if (Cools.isEmpty(deviceBind)) {
            throw new CoolException("库位规则未知");
        }
@@ -534,8 +534,8 @@


            //验证基础信息
            BasStation basStation = checkStaStatus(pakin.getBarcode(), deviceSite.getSite());

            BasStation basStation1 = checkStaStatus(pakin.getBarcode(),basStation.getStationName());
//            BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
//                    .eq(BasContainer::getCode, pakin.getBarcode()));
//            if (Objects.isNull(container)) {
@@ -559,8 +559,8 @@
                    .setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val)
                    .setTargLoc(targetLoc)
                    .setBarcode(pakin.getBarcode())
                    .setOrgSite(deviceSite.getSite())
                    .setTargSite(deviceSite.getDeviceSite())
                    .setOrgSite(basStation.getStationName())
                    .setTargSite(basStation.getStationName())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);