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/DocTypeController.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java index ee3ff8f..4641c70 100644 --- a/src/main/java/com/zy/asrs/controller/DocTypeController.java +++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java @@ -105,12 +105,14 @@ public R query(String condition) { EntityWrapper<DocType> wrapper = new EntityWrapper<>(); wrapper.like("doc_name", condition); - Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper); + wrapper.eq("status", 1); + Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (DocType docType : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", docType.getDocId()); map.put("value", docType.getDocName()); + map.put("type","docType"); result.add(map); } return R.ok(result); -- Gitblit v1.9.1