1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完...

zwl

2025-11-18 608fb6f9529ce51291ef682638a5efc7dd51ac63

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

@@ -39,14 +39,22 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){

        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if(!Cools.isEmpty(param.get("abnormal"))&&param.get("abnormal").equals("1")){
            wrapper.addFilter("anfme < qty");
        }else{
            param.remove("abnormal");
            excludeTrash(param);
            convert(param, wrapper);
        }
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }

        wrapper.eq("status", 1);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/auth")
@@ -57,6 +65,24 @@
        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
    }

    //只有销售单
    @RequestMapping(value = "/orderDetl/pakout/list/auth/xs")
    @ManagerAuth
    public R pakoutListxs(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "10")Integer limit,
                        @RequestParam Map<String, Object> param){
        return R.ok(orderDetlService.getPakoutPagexs(toPage(curr, limit, param, OrderDetl.class)));
    }

    //没有销售单
    @RequestMapping(value = "/orderDetl/pakout/list/auth/notxs")
    @ManagerAuth
    public R pakoutListnotxs(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "10")Integer limit,
                        @RequestParam Map<String, Object> param){
        return R.ok(orderDetlService.getPakoutPagenotxs(toPage(curr, limit, param, OrderDetl.class)));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());