1.新增组托时批号必须唯一 2.新增当有出库任务时禁止AGV入库搬运 3.拣料下架从任务状态16改成34

zwl

2025-09-10 ecd79ff570939b55f455767f2b310590faa5a191

1.新增组托时批号必须唯一
2.新增当有出库任务时禁止AGV入库搬运
3.拣料下架从任务状态16改成34

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

@@ -280,7 +280,7 @@
                    wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                }
                if(wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
                    wrkMast.setWrkSts(16L);//下架完成等待回库
                    wrkMast.setWrkSts(34L);//下架完成等待回库
                }else {
                    wrkMast.setWrkSts(15L);
                }

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

@@ -102,15 +102,25 @@

        Date now = new Date();

        //进行批号筛选，批号只能唯一
        Set<String> batchs=new  HashSet<>();
        List<String> strings=new  ArrayList<>();


        for(CombParam.CombMat mat : param.getCombMats()){
            if(Cools.isEmpty(mat.getBatch())){
                throw new CoolException("物料批号不能为空");
                continue;
            }
            batchs.add(mat.getBatch());
            strings.add(mat.getBatch());
            WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
            WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
            LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
            if(!Cools.isEmpty(batch)||!Cools.isEmpty(batch1)||!Cools.isEmpty(waitPakin)){
                throw new CoolException("该物料批号"+mat.getBatch()+"已在入库通知档、任务明细和库存中存在");
        }
        if(batchs.size()<param.getCombMats().size()){
        }
        if(batchs.size()<strings.size()){
            throw new CoolException("有重复的物料批号");
        }
        int i =1;

 src/main/java/com/zy/asrs/task/AutoAssignAGVTasks.java

@@ -127,11 +127,19 @@
                            }else {
                                staNo = "101";
                            }

                            break;
                        }
                    }
                }
            }

            //当站点有出库任务时跳过派发任务
            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).lt("wrk_sts",33));
            if(!Cools.isEmpty(wrkMasts1)){
                continue;
            }

            if (Cools.isEmpty(staNo)) {
                return;
            }

 src/main/resources/application.yml

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
    url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
    username: sa
    password: sa@123
  mvc: