#

Junjie

2024-01-09 eed6e52aed587531444c5b51fc55b4f5c6d31b2e

#

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

@@ -2908,36 +2908,40 @@
                    if (ioType != 110 && ioType != 10) {
                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
                        if (ioType == 101) {
                            locDetls.forEach(locDetl -> {
                                Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
                                Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
                                Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
                                Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
                                Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//料箱码
                                List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
                                if (Cools.isEmpty(detl)) {
                                    String suppCode = "";
                                    if (locDetl.getSuppCode() != null) {
                                        suppCode = locDetl.getSuppCode();
                                    }
                                    ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
                                } else {
                                    //出库数量累计
                                    Double conut = 0.0;
                                    for (WrkDetl wrkDetl : detl) {
                                        conut = conut + wrkDetl.getAnfme();
                                    }

                                    for (WrkDetl wrkDetl : detl) {
                                        String suppCode = "";
                                        if (wrkDetl.getSuppCode() != null) {
                                            suppCode = wrkDetl.getSuppCode();
                                        }
                                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
                                    }
                                }

                            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
                            wrkDetls.forEach(wrkDetl -> {
                                ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), 0D, wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
                            });
//                            locDetls.forEach(locDetl -> {
//                                Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
//                                Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
//                                Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
//                                Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
//                                Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//料箱码
//                                List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
//                                if (Cools.isEmpty(detl)) {
//                                    String suppCode = "";
//                                    if (locDetl.getSuppCode() != null) {
//                                        suppCode = locDetl.getSuppCode();
//                                    }
//                                    ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
//                                } else {
//                                    //出库数量累计
//                                    Double conut = 0.0;
//                                    for (WrkDetl wrkDetl : detl) {
//                                        conut = conut + wrkDetl.getAnfme();
//                                    }
//
//                                    for (WrkDetl wrkDetl : detl) {
//                                        String suppCode = "";
//                                        if (wrkDetl.getSuppCode() != null) {
//                                            suppCode = wrkDetl.getSuppCode();
//                                        }
//                                        ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
//                                    }
//                                }
//
//                            });
                        } else {
                            locDetls.forEach(locDetl -> {
                                Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);
@@ -2972,12 +2976,12 @@
                        }


                        if (ioType == 101 || ioType == 107) {//全板出库或盘点出库，查询wrkDetl
                        if (ioType == 107) {
                            locDetls = new ArrayList<>();
                            ledCommand.setMatDtos(new ArrayList<>());
                        }

                        if (locDetls.isEmpty()) {
                        if (locDetls.isEmpty() && ioType != 101) {
                            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
                            wrkDetls.forEach(wrkDetl -> {
                                ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));