自动化立体仓库 - WMS系统
gt-fuwuqi
2024-11-15 b3bddb829879019eecd1b58b1f827d152974aade
出库修改限制
2个文件已修改
24 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OutController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java
@@ -92,19 +92,19 @@
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }else if (locMast.getBay1() >=4 && locMast.getBay1()<=12){
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", true));
                        }else {
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }
                        for (LocMast locMast1 : locMasts){
@@ -152,7 +152,7 @@
                            }
                            locDto.setStaNos(maps);
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
//                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        }else {
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -263,10 +263,10 @@
            throw new CoolException("请提取一个商品,或者刷新重新组托!");
        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }
//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
//            throw new CoolException(param.getBarcode() + "数据正在进行入库");
//        }
        if(param.getBarcode().length()!=9){
            throw new CoolException("条码长度不是9位===>>" + param.getBarcode());
@@ -274,9 +274,9 @@
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if (countLoc > 0 || countWrk > 0) {
            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
        }
        Date now = new Date();
@@ -818,7 +818,7 @@
        String barcode2 = map.get("barcode2").toString();
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode2));
        int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("zpallet",barcode2).ne("io_type",200));
        int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",barcode2).ne("io_type",200));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode2));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("该条码已被使用===>>" + barcode2);