Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

Junjie

2023-10-07 dca05a46447295fb484445c910a967fb2b107bc6

 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();
    }

@@ -441,9 +441,9 @@
            Row row = sheet.getRow(i);
            // 订单编号
            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)));
@@ -497,9 +497,9 @@
                        null,    // 物流单号
                        1L,    // 订单状态
                        1,    // 状态
                        9527L,    // 添加人员
                        userId,    // 添加人员
                        now,    // 添加时间
                        9527L,    // 修改人员
                        userId,    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
@@ -516,9 +516,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);