#

Junjie

2023-10-01 183d00d631493ba8689934c4b3961c705f409c83

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

@@ -356,14 +356,14 @@
    @Transactional
    public R delete(@RequestParam Long orderId){
        orderService.remove(orderId);
//        Order order = orderService.selectById(orderId);
//        if (order != null) {
//            order.setStatus(0);
//        }
//        if (!orderService.updateById(order)) {
//            throw new CoolException("删除订单失败");
//        }
//        orderDetlService.modifyStatus(orderId, 0);
        return R.ok();
    }

    @RequestMapping(value = "/order/report/auth")
    @ManagerAuth(memo = "手动上传订单")
    @Transactional
    public R report(@RequestParam Long orderId){
        orderService.report(orderId,getUserId());
        return R.ok();
    }

@@ -443,7 +443,7 @@
            String uuid = dataFormatter.formatCellValue(row.getCell(0));
            // 物料号
            String maktx = dataFormatter.formatCellValue(row.getCell(1));
            // 单据号
            // 物料号
            String matnr = dataFormatter.formatCellValue(row.getCell(2));
            // 数量
            Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));