#

ytfl

2025-07-22 6a7617cdc6b06ab061417b8cc8b6a4fd13a47a7b

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

@@ -285,9 +285,12 @@
        MatParam matParam = new MatParam();
        Synchro.Copy(mat, matParam);
        matParam.setBatch(nccQilibcTmprintWms.getVbatchcode());
        matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
        matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
//        matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
//        matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
        matParam.setAnfme(0.0D);
        matParam.setAnfme2(0.0D);
        matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
        matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
        return R.ok().add(matParam);
    }

@@ -332,6 +335,13 @@
        map.put("orderNo", split[0]);
        map.put("matData", matParam);
        return R.ok().add(map);
    }

    @RequestMapping("/comb/cancel")
    @ManagerAuth(memo = "取消组托")
    public R combCancel(@RequestBody CombCancelParam param) {
        mobileService.combCancel(param, getUserId());
        return R.ok("取消组托成功");
    }

    @RequestMapping("/comb/auth")
@@ -681,4 +691,11 @@
        return R.ok("出库成功");
    }

    @RequestMapping("/checkOut/submit/auth")
    @ManagerAuth(memo = "盘点上报ERP")
    public R checkOutSubmit(@RequestParam("orderId") Integer orderId) {
        mobileService.checkOutSubmit(orderId, getUserId());
        return R.ok("上报ERP成功");
    }

}