parent: 5b7b608a | 补丁 | 提交 | ignore whitespace
1
14 小时以前 d91fae31f20fa81081fe1b0769437be66470175d 
lsh#
7个文件已修改
55 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java


@@ -262,7 +262,7 @@




        BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()


                        .eq(BasStation::getBarcode, barcode)


                , false


                .last("limit 1")


        );


        if (!Cools.isEmpty(isBarcodeSta)) {


            throw new CoolException("该条码已被" + isBarcodeSta.getStationName() + "站绑定");




 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java


@@ -99,7 +99,7 @@


        if (checkDiff.getExceStatus().equals(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)) {


            return R.error("该盘点单已完成");


        }


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()));


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()).last("limit 1"));


        if (null == task) {


            throw new CoolException("数据错误，未找到容器码对应盘点任务");


        }


@@ -113,7 +113,7 @@


                        .setBarcode(task.getBarcode())


                        .setAnfme(ckDiffItem.getCheckQty());




                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));


                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()).last("limit 1"));


                if (Objects.isNull(matnr)) {


                    throw new CoolException("单据物料名称不存在！！");


                }


@@ -203,7 +203,7 @@


        if (Cools.isEmpty(matnrCode)){


            return R.error("物料码为空");


        }


        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));


        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode).last("limit 1"));


        if (null == matnr){


            return R.error("未找到编码对应的明细");


        }


@@ -220,7 +220,7 @@


    public R getCheckTaskItemList2(String barcode) {


        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();


        lambdaQueryWrapper.eq(Task::getBarcode, barcode);


        Task task = taskService.getOne(lambdaQueryWrapper);


        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));


        if (null == task) {


            throw new CoolException("未找到容器号对应任务");


        }


@@ -232,7 +232,7 @@


            throw new CoolException("未找到该容器码对应的任务明细");


        }


        String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);


        CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));


        CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode).last("limit 1"));


        if (null == checkDiff) {


            return R.error("未找到盘点差异单");


        }




 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java


@@ -55,7 +55,7 @@


    public R getOutStockTaskItem(String barcode) {


        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();


        lambdaQueryWrapper.eq(Task::getBarcode, barcode);


        Task task = taskService.getOne(lambdaQueryWrapper);


        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));


        if (null == task) {


            return R.error("未查询到相关任务");


        }


@@ -72,7 +72,7 @@


    public R saveOutTaskSts(String barcode) {


        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();


        lambdaQueryWrapper.eq(Task::getBarcode, barcode);


        Task task = taskService.getOne(lambdaQueryWrapper);


        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));


        if (null == task) {


            throw new CoolException("未找到容器号对应任务");


        }


@@ -110,7 +110,7 @@


        if (Cools.isEmpty(barcode)) {


            throw new CoolException("参数有误");


        }


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode).last("limit 1"));


        if (null == task) {


            throw new CoolException("未找到容器号对应任务");


        }


@@ -157,7 +157,7 @@


        if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0) {


            return R.error("参数错误");


        }


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()));


        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()).last("limit 1"));


        if (null == task) {


            return R.error("未找到托盘对应的任务");


        }


@@ -240,7 +240,7 @@


        BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()


                .eq(BasStation::getStationName, containerWaveParam.getStaNo())


                .orderByDesc(BasStation::getId)


                .last("LIMIT 1"), false);


                .last("LIMIT 1"));




        if (Objects.isNull(basStation)) {


            throw new CoolException(containerWaveParam.getStaNo() + "站点不存在！！");


@@ -255,7 +255,7 @@


        }




        BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()


                        .in(BasContainer::getContainerType, containerWaveParam.getType(), false));


                        .in(BasContainer::getContainerType, containerWaveParam.getType(), false).last("limit 1"));


        if (Cools.isEmpty(basContainer)){


            throw new CoolException("未查询到相关容器规则");


        }




 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java


@@ -220,7 +220,7 @@


                BeanUtils.copyProperties(matnr, mat);


                mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx());


                if (!Objects.isNull(matnr.getGroupName())) {


                    MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()), false);


                    MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()).last("limit 1"), false);


                    if (Objects.isNull(matnrGroup)) {


                        mat.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());


                    }


@@ -243,14 +243,14 @@


    @Override


    public R queryOrderStatus(QueryOrderParam queryParams) {


        WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()


                .eq(WkOrder::getPoCode, queryParams.getOrderNo()));


                .eq(WkOrder::getPoCode, queryParams.getOrderNo()).last("limit 1"));


        if (Objects.isNull(wkOrders)) {


            Map<String, Object> map = new HashMap<>();


            map.put("exceStatus", "-1");


            return R.ok("单据不存在 ！！").add(map);


        }




        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));


        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()).last("limit 1"));


        if (!Objects.isNull(orderLog)) {


            Map<String, Object> map = new HashMap<>();


            map.put("exceStatus", "4");


@@ -394,7 +394,7 @@


            if (Objects.isNull(companys.getCode())) {


                throw new CoolException("企业编码不能为空！！");


            }


            Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()));


            Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()).last("limit 1"));


            if (Objects.isNull(one)) {


                String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);


                companys.setCode(ruleCode);




 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java


@@ -699,7 +699,7 @@


                    }


                    String shallowLocNo = LocUtils.getShallowLoc(loc1.getCode());


                    // 检测目标库位是否为空库位


                    Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo));


                    Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo).last("limit 1"));


                    if (shallowLoc != null && shallowLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {


                        if (LocUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {


                            loc = shallowLoc;




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


@@ -108,7 +108,7 @@


                //空容器出库


                DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                        .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())


                        .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_OUT.type));


                        .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_OUT.type).last("limit 1"));


                if (Objects.isNull(deviceSite)) {


                    throw new CoolException("站点不支持空容器出库！！");


                }


@@ -213,7 +213,7 @@


                    DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                            .eq(DeviceSite::getSite, siteNo)


                            .eq(!Objects.isNull(loc.getChannel()),DeviceSite::getChannel, loc.getChannel())


                            .eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type));


                            .eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).last("limit 1"),false);


                    if (Objects.isNull(deviceSite)) {


                        throw new CoolException("站点不支持拣料出库！！");


                    }


@@ -223,7 +223,7 @@


                        //全板出库


                        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                                .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)


                                .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()));


                                .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()).last("limit 1"));


                        if (Objects.isNull(deviceSite)) {


                            throw new CoolException("站点不支持越库！！");


                        }


@@ -232,7 +232,7 @@


                        //全板出库


                        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                                .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_OUT.type)


                                .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()));


                                .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()).last("limit 1"));


                        if (Objects.isNull(deviceSite)) {


                            throw new CoolException("站点不支持全板出库！！");


                        }


@@ -245,7 +245,7 @@


                DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                        .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())


                        .eq(DeviceSite::getSite, siteNo)


                        .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type));


                        .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));


                if (Objects.isNull(deviceSite)) {


                    throw new CoolException("当前站点不支持盘点出库！！");


                }


@@ -399,7 +399,7 @@


            //目标库位为空，自动获取新库位


            DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()


                    .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)


                    .eq(!Objects.isNull(orgLoc.getChannel()), DeviceSite::getChannel, orgLoc.getChannel()), false);


                    .eq(!Objects.isNull(orgLoc.getChannel()), DeviceSite::getChannel, orgLoc.getChannel()).last("limit 1"), false);


            if (Objects.isNull(deviceSite)) {


                throw new CoolException("站点信息不存在！！");


            }




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


@@ -1337,7 +1337,7 @@


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public Task pickOrCheckTask(Long id, String oType) throws Exception {


    public synchronized Task pickOrCheckTask(Long id, String oType) throws Exception {


        Task task = this.getById(id);


        if (Objects.isNull(task)) {


            throw new CoolException("当前任务不存在！！");


@@ -1375,7 +1375,12 @@


                .setIoType(type)


                .setLocType1(Integer.parseInt(loc.getType()));


        //获取新库位


        InTaskMsgDto locInfo = wcsService.getLocNo(param);


        InTaskMsgDto locInfo = null;


        try{


            locInfo = wcsService.getLocNo(param);


        } catch (Exception e) {


            throw new CoolException("获取库位失败！！"+e.getMessage());


        }




        if (Objects.isNull(locInfo)) {


            throw new CoolException("获取库位失败！！");