订单追溯完善

pjb

4 天以前 e50218d4ba057a4a33af708ad13b8ef77c41e91c

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

@@ -87,6 +87,21 @@
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/locMast/emptyList/auth")
    @ManagerAuth
    public R emptyList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.in("loc_sts","Z","M");
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        boolean sign = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -128,12 +143,12 @@
            return R.error();
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("source_loc_no", locMast.getLocNo())
                .or().eq("loc_no", locMast.getLocNo()));
        if(!Cools.isEmpty(wrkMast)){
            return  R.error("该库位正在作业，请先处理工作档");
        }
//        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
//                .eq("source_loc_no", locMast.getLocNo())
//                .or().eq("loc_no", locMast.getLocNo()));
//        if(!Cools.isEmpty(wrkMast)){
//            return  R.error("该库位正在作业，请先处理工作档");
//        }

        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {