From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/controller/ConfigTypeController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConfigTypeController.java b/src/main/java/com/zy/asrs/controller/ConfigTypeController.java
index 7b1a9eb..02c7cc1 100644
--- a/src/main/java/com/zy/asrs/controller/ConfigTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/ConfigTypeController.java
@@ -15,8 +15,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
@RestController
public class ConfigTypeController extends BaseController {
@@ -47,7 +46,7 @@
@RequestMapping(value = "/configType/add/auth")
@ManagerAuth
- public R list(ConfigType configType){
+ public R add(ConfigType configType){
if (Cools.isEmpty(configType)){
return R.error();
}
@@ -57,6 +56,35 @@
}
+ @RequestMapping(value = "/configType/delete/auth")
+ @ManagerAuth
+ public R delete(Long id){
+ configTypeService.deleteById(id);
+ return R.ok();
+
+ }
+
+ @RequestMapping(value = "/configTypeQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+
+ String type = condition.split(",")[1];
+ condition = condition.split(",")[0];
+
+ EntityWrapper<ConfigType> wrapper = new EntityWrapper<>();
+ wrapper.eq("type",type);
+ wrapper.like("value", condition);
+ Page<ConfigType> page = configTypeService.selectPage(new Page<>(0, 32), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ConfigType configType : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", configType.getId());
+ map.put("value", configType.getValue());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1