#

luxiaotao1123

2021-04-05 52a0d2d78b0c565d05b6bccd3a5519636438dd23

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -50,17 +50,33 @@
        boolean error = false;
        for (OpenApiStockOutParam param : params) {
            Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
            double lack = 0.0D;
            if (sumAnfme < param.getAnfme()) {
                lack = param.getAnfme() - sumAnfme;
                if (!error) {
                    error = true;
                }
                MatCode mat = matCodeService.selectById(param.getMatnr());
                // 视图对象
                StoPreTab tab = new StoPreTab();
                tab.setTitle(param.getMatnr() + (mat==null?"": "（" + mat.getMatName() + "）"));
                tab.setMatnr(param.getMatnr());
                tab.setMaktx((mat==null?"": "（" + mat.getMatName() + "）"));
                tab.setAnfme(param.getTotal());
                tab.setLocNo("缺货");
                tab.setTotal(lack);
                tab.setReduce(lack);
                tab.setRemQty(0.0D);
                tab.setPrior(false);
                tab.setPrior$("×");
                tab.setType(0);
                result.add(tab);

                errorMsg.append(mat == null ? param.getMatnr() : mat.getMatName()).append("库存不足，缺货数量：").append(param.getAnfme() - sumAnfme).append("</br>");
                continue;
//                continue;
            }
            List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
            double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
            double anfme = issued;
            double issued = Optional.of(param.getAnfme() - lack).orElse(0.0D) ;
            for (LocDetl locDetl : locDetls) {
                if (issued > 0) {
                    // 视图对象
@@ -85,10 +101,10 @@
            }

        }
        if (error) {
            return R.error(errorMsg.toString());
        }
        return R.ok().add(result);
//        if (error) {
//            return R.error(errorMsg.toString());
//        }
        return R.ok(errorMsg).add(result);
    }

    @PostMapping("/stockOut")
@@ -102,13 +118,21 @@
                    throw new CoolException("当前补仓任务正在执行，请耐心等待");
                }
                Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
                double lack = 0.0D;
                if (sumAnfme < param.getAnfme()) {
                    throw new CoolException(param.getMatnr() + "物料数量不足，缺货数量：" + (param.getAnfme() - sumAnfme));
                    lack = param.getAnfme() - sumAnfme;
                    PakoutVo pakoutVo = new PakoutVo();
                    pakoutVo.setLocNo("缺货");
                    pakoutVo.setAnfme(lack);
                    pakoutVo.setMatnr(param.getMatnr());
//                    pakoutVo.setZpallet("param.getZpallet()");
                    result.add(pakoutVo);

//                    throw new CoolException(param.getMatnr() + "物料数量不足，缺货数量：" + (param.getAnfme() - sumAnfme));
                }

                List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
                double issued = Optional.ofNullable(param.getAnfme()).orElse(0.0D) ;
                double anfme = issued;
                double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        // 生成出库工作档