添加出库单据

zhangchao

2024-11-12 319e3a08d77530ac40dcbdd2c3191490df630348

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

@@ -106,7 +106,9 @@
        // 上述已自定义搜索，移除操作人姓名搜索
        param.remove("oper_memb");
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
@@ -149,12 +151,16 @@
            return R.error("单据编号在历史档中已存在");
        }
        Date now = new Date();
        Long itemId = null;
        if (param.getDocType() == 16 || param.getDocType() == 19) {
            itemId = 1L;
        }
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                itemId,    // 项目编号
                param.getItemName(),    //
                null,    // 调拨项目编号
                null,    // 初始票据号
@@ -297,7 +303,9 @@
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -396,6 +404,7 @@
        }
        return R.ok();
    }

    @RequestMapping(value = "/order/print/auth")
    @ManagerAuth(memo = "订单编码打印")
    public R orderPrint(@RequestParam(value = "param[]") String[] param) {
@@ -480,7 +489,6 @@
        }
        return R.ok(orderDetls);
    }



}