Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-10-02 249dc044ca3bb63b40da5cf67788981992887256

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

@@ -170,7 +170,7 @@
        if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
            //先去入库通知档找明细
            Page<AgvWaitPakin> agvWaitPakinPage = agvWaitPakinService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWaitPakin>()
                    .eq("zpallet", agvBasDevp.getBarcode()));
                    .eq("supp_code", agvBasDevp.getBarcode()));
            if(agvWaitPakinPage.getRecords().size()>0){
                return R.ok(agvWaitPakinPage);
            }else {