#

luxiaotao1123

2022-10-19 3989e356b6b8bcd31e2d2981ac78e41f8ebbdfa5

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

@@ -101,7 +101,9 @@
    @RequestMapping(value = "/order/detl/all/auth")
    @ManagerAuth
    public R head(@RequestParam Long orderId){
        return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
        orderDetls.removeIf(next -> next.getQty() > 0);
        return R.ok().add(orderDetls);
    }

    @RequestMapping(value = "/order/form/add/auth")
@@ -497,9 +499,9 @@
                        null,    // 物流单号
                        1L,    // 订单状态
                        1,    // 状态
                        9527L,    // 添加人员
                        userId,    // 添加人员
                        now,    // 添加时间
                        9527L,    // 修改人员
                        userId,    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
@@ -516,9 +518,9 @@
                orderDetl.setAnfme(anfme);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateBy(userId);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateBy(userId);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);