证书问题

zhangchao

2024-09-10 dc611cd221af70205e23f79d03298700de36b0f6

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

@@ -189,22 +189,20 @@
    @RequestMapping("/pakout/query/auth")
    @ManagerAuth
    @Deprecated
    public R pakoutQuery(@RequestParam(required = false) String barcode,
                         @RequestParam(required = false) Integer staNo,
                         @RequestParam(required = false) String matnr) {
        if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
    public R pakoutQuery(@RequestParam String barcode) {
        if (Cools.isEmpty(barcode)) {
            return R.ok();
        }
        if (!Cools.isEmpty(barcode)) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
            return R.ok().add(wrkDetls);
        }
        if (!Cools.isEmpty(matnr)) {
            if (!Cools.isEmpty(staNo)) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
                return R.ok().add(wrkDetls);
            }
        }
//        if (!Cools.isEmpty(matnr)) {
//            if (!Cools.isEmpty(staNo)) {
//                List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
//                return R.ok().add(wrkDetls);
//            }
//        }
        return R.ok();
    }

@@ -446,7 +444,7 @@
                CombBillQueryVo vo = new CombBillQueryVo();
                vo.setMatnr(waitMatin.getMatnr());
                vo.setMatName(waitMatin.getMaktx());
                vo.setQty(waitMatin.getAnfme());
                vo.setQty(waitMatin.getAnfme() - waitMatin.getWorkQty());
                vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
                vo.setBillNo(waitMatin.getOrderNo());
                vo.setSeqNo(waitMatin.getINo());