From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择

---
 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