From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 14 三月 2024 10:14:28 +0800 Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善 --- src/main/java/com/zy/asrs/controller/OrderController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index f47db1a..863f61e 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -344,10 +344,11 @@ } @RequestMapping(value = "/orderQuery/auth") - @ManagerAuth +// @ManagerAuth public R query(String condition) { EntityWrapper<Order> wrapper = new EntityWrapper<>(); wrapper.like("order_no", condition); + wrapper.le("settle",3); Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (Order order : page.getRecords()){ -- Gitblit v1.9.1