#

lsh

2024-10-25 b453fa6c987210616dfab066cc097cf9f742999e

#

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

@@ -205,16 +205,20 @@
                            }
                            continue;
                        }
                        if (detl.getAnfme() >= locDetl.getCount()) {
                            locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), locDetl.getCount()));
                            isOut = locDetl.getCount();
                            isfull = true;
                            break;
                        if (!param.getOutSite().equals(214) && !param.getOutSite().equals(114)){
                            if (detl.getAnfme() >= locDetl.getCount()) {
                                locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), locDetl.getCount()));
                                isOut = locDetl.getCount();
                                isfull = true;
                                break;
                            } else {
                                locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
                                isOut = detl.getAnfme();
                            }
                        } else {
                            //强制不是相同物料
                            locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
                            isOut = detl.getAnfme();
                        }

                    }
                }
            }
@@ -813,8 +817,17 @@
            if (locNos.contains(locNo)) {
                for (OutLocDto dto : dtos) {
                    if (dto.getLocNo().equals(locNo)) {
                        dto.getLocDetlDtos().add(locDetlDto);
                        break;
                        boolean signDto = false;
                        for (LocDetlDto locDetlDto1 : dto.getLocDetlDtos()){
                            if (locDetlDto1.getLocDetl().getBatch().equals(locDetlDto.getLocDetl().getBatch())
                                    && locDetlDto1.getLocDetl().getMatnr().equals(locDetlDto.getLocDetl().getMatnr())){
                                signDto = true;
                            }
                        }
                        if (!signDto){
                            dto.getLocDetlDtos().add(locDetlDto);
                            break;
                        }
                    }
                }
            } else {