#

Junjie

2025-08-17 f3f2c64ad502c054a996cff6ec9a0a091f54e8a8

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

@@ -1650,6 +1650,7 @@
                if (crnProtocol.getTaskNo() == 9999) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                    redisUtil.set(RedisConstantType.CRN_MOVE_LOCK + crn.getId(), "lock", 8);//防止回原点后下发指令过快
                    continue;
                }

@@ -2139,22 +2140,64 @@
//                    }catch (Exception e){
//                        log.error("工作档案明细输入电视机失败1：异常信息==》"+e);
//                    }
                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
                            wrkDetl.getMatnr()
                            , wrkDetl.getMaktx()
                            , wrkDetl.getAnfme()
                            , wrkDetl.getWeight()
                            , wrkDetl.getStockNum()
                            , wrkDetl.getStockNum2()
                            , wrkDetl.getSpecs()
                            , wrkDetl.getSku()
                            , wrkDetl.getZpallet()
                            , wrkDetl.getModel()
                            , wrkDetl.getSupp()
                            , wrkDetl.getKpCstmrName()
                            , wrkDetl.getOrderNo()
                            , wrkDetl.getCstateid$()
                    )));

                    if (!wrkDetls.isEmpty()) {
                        WrkDetl wrkDetl = wrkDetls.get(0);
                        double anfme = 0D;
                        double weight = 0D;
                        for (WrkDetl detl : wrkDetls) {
                            anfme += detl.getAnfme();
                            weight += detl.getWeight();
                            wrkDetl.setAnfme(anfme);
                            wrkDetl.setWeight(weight);
                        }

                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                                .eq("loc_no", wrkMast.getSourceLocNo()));
                        double totalAnfme = 0D;
                        double totalWeight = 0D;
                        for (LocDetl locDetl : locDetls) {
                            totalAnfme += locDetl.getAnfme();
                            totalWeight += locDetl.getWeight();
                        }
                        wrkDetl.setStockNum(totalAnfme);
                        wrkDetl.setStockNum2(totalWeight);

                        ledCommand.getMatDtos().add(new MatDto(
                                wrkDetl.getMatnr()
                                , wrkDetl.getMaktx()
                                , wrkDetl.getAnfme()
                                , wrkDetl.getWeight()
                                , wrkDetl.getStockNum()
                                , wrkDetl.getStockNum2()
                                , wrkDetl.getSpecs()
                                , wrkDetl.getSku()
                                , wrkDetl.getZpallet()
                                , wrkDetl.getModel()
                                , wrkDetl.getSupp()
                                , wrkDetl.getKpCstmrName()
                                , wrkDetl.getOrderNo()
                                , wrkDetl.getCstateid$()
                        ));

//                        wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
//                                wrkDetl.getMatnr()
//                                , wrkDetl.getMaktx()
//                                , wrkDetl.getAnfme()
//                                , wrkDetl.getWeight()
//                                , wrkDetl.getStockNum()
//                                , wrkDetl.getStockNum2()
//                                , wrkDetl.getSpecs()
//                                , wrkDetl.getSku()
//                                , wrkDetl.getZpallet()
//                                , wrkDetl.getModel()
//                                , wrkDetl.getSupp()
//                                , wrkDetl.getKpCstmrName()
//                                , wrkDetl.getOrderNo()
//                                , wrkDetl.getCstateid$()
//                        )));
                    }

                }
                commands.add(ledCommand);
            }