Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-04-18 87df6a2ac0ac8dc46dde8b83853aebdf7efafe64

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

@@ -82,17 +82,11 @@
                param.remove("modi_time");
            }
        }
        param.remove("curr");
        param.remove("limit");
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
        Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
        if (locDetlPage.getRecords().size()==0){
            locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        if (stockOut.getRecords().size()==0){
            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
        }
        return R.ok(locDetlPage);
        return R.ok(stockOut);
    }

    @RequestMapping(value = "/stock/out/crn/list/auth")
@@ -304,8 +298,25 @@
     * @return
     */
    @RequestMapping("/locDetl/count")
    public R getAllCount(){
        Integer sum = locDetlService.sum();
    public R getAllCount() {
        Double sum = locDetlService.sum();
        return R.ok(sum);
    }

    /**
     * 获取库存总数
     * @return
     */
    @RequestMapping("/locDetl/matnr/count")
    public R getCount(@RequestBody Map<String, String> param){
        String matnr = param.get("matnr");
        Double sum = 0.0;
        if (Cools.isEmpty(matnr)){
            sum = locDetlService.sum();
        }else {
            sum = locDetlService.getSumAnfme(matnr);
        }

        return R.ok(sum);
    }