#订单出库有小数时，优先出小数

zjj

2023-09-14 11341e4c1a948b579828b6d45a7d274346f75074

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

@@ -345,6 +345,7 @@
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        String payment = String.valueOf(param.get("payment"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);
        }
@@ -353,6 +354,9 @@
        }
        if (!Cools.isEmpty(owner) && !owner.equals("null")) {
            locDetlDTO.setOwner(owner);
        }
        if (!Cools.isEmpty(payment) && !payment.equals("null")) {
            locDetlDTO.setPayment(payment);
        }
        List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
        int count = locDetlService.selectAllPymentcount(locDetlDTO);
@@ -398,8 +402,26 @@
        Page<LocDetlAll> page = new Page<>();
        page.setRecords(list);
        page.setTotal(count);
        if (list.size()==0){
            locDetlDTO.setPageNumber(1);
            list = locDetlService.selectAllOwner(locDetlDTO);
            count = locDetlService.selectAllCount(locDetlDTO);
            page = new Page<>();
            page.setRecords(list);
            page.setTotal(count);
        }
        return R.ok(page);
    }

    @RequestMapping(value = "/locDetl/selectLocF")
    @ManagerAuth
    public R selectLocF(@RequestParam String locNo){
        String s = locDetlService.selectLocNoF(locNo);
        if (s.equals("F")){
            return R.error("当前库位不是空库位");
        }
        return R.ok("当前库位是空库位");
    }


}