#

Junjie

2024-01-21 066844c6f846b1f23120b82910c2360c46eed05b

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

@@ -2633,9 +2633,10 @@
                    }

                    if (wrkMast.getInvWh() == null) {
                        wrkMast.setInvWh("Y");//标记已经下发机械臂任务
                        if (wrkMastMapper.updateById(wrkMast) > 0) {
                            RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
                        boolean result = RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
                        if (result) {
                            wrkMast.setInvWh("Y");//标记已经下发机械臂任务
                            wrkMastMapper.updateById(wrkMast);
                        }
                    }
                }
@@ -2652,9 +2653,10 @@
                        continue;
                    }
                    if (wrkMast.getInvWh() == null) {
                        wrkMast.setInvWh("Y");//标记已经下发机械臂任务
                        if (wrkMastMapper.updateById(wrkMast) > 0) {
                            RobotUtils.sendTask(staProtocol317.getWorkNo().toString(), wrkDetls.size(), "317");
                        boolean result = RobotUtils.sendTask(staProtocol317.getWorkNo().toString(), wrkDetls.size(), "317");
                        if (result) {
                            wrkMast.setInvWh("Y");//标记已经下发机械臂任务
                            wrkMastMapper.updateById(wrkMast);
                        }
                    }
                }
@@ -2968,7 +2970,7 @@
                                        if (wrkDetl.getSuppCode() != null) {
                                            suppCode = wrkDetl.getSuppCode();
                                        }
                                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), 0D, wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
                                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
                                    }
                                }