自动化立体仓库 - WCS系统
Junjie
2024-01-09 584a10477ffa1f670d07a05401ab7ec2c696204a
Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
1个文件已修改
88 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2907,36 +2907,70 @@
                    ledCommand.setBarcode(barcode);
                    if (ioType != 110 && ioType != 10) {
                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
                        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) {
                        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 (wrkDetl.getSuppCode() != null) {
                                        suppCode = wrkDetl.getSuppCode();
                                    if (locDetl.getSuppCode() != null) {
                                        suppCode = locDetl.getSuppCode();
                                    }
                                    ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
                                }
                            }
                                    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);
                                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(), 0D, wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
                                    }
                                }
                            });
                        }
                        if (ioType == 101 || ioType == 107) {//全板出库或盘点出库,查询wrkDetl
                            locDetls = new ArrayList<>();