1.完善AGV任务创建和下发 2.完善数据孪生 3.新增拍照获取照片 4.新增PDA配盘出库单立即出库 5.新增PDA配盘入库单下拉框获取订单号

zwl

2025-12-27 f14bb52ddab40bf589304b6b43331ddaccea69f6

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

@@ -67,7 +67,7 @@
                // 保存工作档
                Task task = new Task();
                Date date = new Date();
                String TaskNo = wrkMast.getWrkNo() + "-" + date.getTime();
                String TaskNo = wrkMast.getWrkNo() + "aa" + date.getTime();
                task.setWrkNo(wrkMast.getWrkNo())
                        .setTaskNo(TaskNo)
                        .setIoTime(date)
@@ -78,8 +78,8 @@
                        .setFullPlt("Y") // 满板：Y
                        .setPicking("N") // 拣料
                        .setExitMk("N")// 退出
                        .setStaNo(stnNo)
                        .setSourceStaNo(wrkMast.getSourceStaNo())//空料架缓存区E1
                        .setStaNo(wrkMast.getMemo())
                        .setSourceStaNo("Z-"+wrkMast.getSourceStaNo())
                        .setEmptyMk("N")// 空板
                        .setBarcode(wrkMast.getBarcode())// 托盘码
                        .setLinkMis("N")
@@ -123,7 +123,7 @@
                    //如果是接驳站点则需要判断接驳站点是否有空料架
                    //如果有空料架需要判断是否有出库任务
                    //有出库任务则禁止下发本次搬运任务
                    if (task.getStaNo().equals("401") || task.getStaNo().equals("402") || task.getStaNo().equals("307")) {
                    if (task.getStaNo().equals("Z-401") || task.getStaNo().equals("Z-402") || task.getStaNo().equals("Z-307")) {
                        BasDevp basDevp = basDevpService.checkSiteStatus(Integer.parseInt(task.getStaNo()));
                        if (basDevp != null && !Cools.isEmpty(basDevp.getInreq1()) && basDevp.getInreq1().equals("Y")) {
                            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -139,13 +139,13 @@
                                    //生成AGV搬运出库任务
                                    // 保存工作档
                                    String SourceStaNo = "";
                                    if (task.getStaNo().equals("401")) {
                                    if (task.getStaNo().equals("Z-401")) {
                                        //大料架缓冲区
                                        SourceStaNo = "E3";
                                    }else if (task.getStaNo().equals("402")) {
                                        SourceStaNo = "E2";
                                    }else if (task.getStaNo().equals("307")) {
                                        SourceStaNo = "E1";
                                        SourceStaNo = "Q-E3";
                                    }else if (task.getStaNo().equals("Z-402")) {
                                        SourceStaNo = "Q-E2";
                                    }else if (task.getStaNo().equals("Z-307")) {
                                        SourceStaNo = "Q-E1";
                                    }
                                    Task task3 = new Task();
                                    Date date = new Date();
@@ -183,10 +183,18 @@
                        if (!start.isSuccess()) {
                            task.setUpdMk("X");
                            task.setErrorMemo(start.getMsg());
                            task.setCtnType(task.getCtnType()+1);//下发任务计数
                            task.setModiTime(new Date());
                            if (!taskService.updateById(task)) {
                                log.error("工作档[workNo={}]标记待处理失败", task.getWrkNo());
                            }
                        }else {
                            task.setCtnType(task.getCtnType()+1);
                            task.setModiTime(new Date());
                            task.setWrkSts(302L);//任务执行中
                            if (!taskService.updateById(task)) {
                                log.error("工作档[workNo={}]标记待处理失败", task.getWrkNo());
                            }
                        }
                    }