From b27d4ac5d97145f649d4be102c5b380d5f05463a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 22 十二月 2023 15:39:21 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
index 6b07c5c..06d6416 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
@@ -10,8 +10,8 @@
 import com.zy.asrs.common.utils.*;
 import com.zy.asrs.common.wms.entity.Mat;
 import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.ManMatService;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.TagService;
 import com.zy.asrs.framework.annotations.ManagerAuth;
 import com.zy.asrs.framework.common.BaseRes;
 import com.zy.asrs.framework.common.Cools;
@@ -36,16 +36,16 @@
 public class ManTagController extends BaseController {
 
     @Autowired
-    private ManTagService manTagService;
+    private TagService tagService;
     @Autowired
-    private ManMatService manMatService;
+    private MatService matService;
     @Autowired
     private TreeUtils treeUtils;
 
     @RequestMapping(value = "/manTag/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(manTagService.getById(String.valueOf(id)));
+        return R.ok(tagService.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/manTag/page/auth")
@@ -63,14 +63,14 @@
             wrapper.ge(Tag::getCreateTime, DateUtils.convert(range[0]));
             wrapper.le(Tag::getCreateTime, DateUtils.convert(range[1]));
         }
-        return R.ok(manTagService.page(new Page<>(curr, limit), wrapper));
+        return R.ok(tagService.page(new Page<>(curr, limit), wrapper));
     }
 
 
     @RequestMapping(value = "/manTag/add/auth")
     @ManagerAuth
     public R add(Tag tag) {
-        manTagService.save(tag);
+        tagService.save(tag);
         return R.ok();
     }
 
@@ -80,7 +80,7 @@
         if (Cools.isEmpty(tag) || null== tag.getId()){
             return R.error();
         }
-        manTagService.updateById(tag);
+        tagService.updateById(tag);
         return R.ok();
     }
 
@@ -88,7 +88,7 @@
     @ManagerAuth
     public R delete(@RequestParam(value="ids[]") Long[] ids){
          for (Long id : ids){
-            manTagService.removeById(id);
+            tagService.removeById(id);
         }
         return R.ok();
     }
@@ -98,7 +98,7 @@
     public R query(String condition) {
         LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(Tag::getId, condition);
-        Page<Tag> page = manTagService.page(new Page<>(0, 10), wrapper);
+        Page<Tag> page = tagService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (Tag tag : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
@@ -117,7 +117,7 @@
         if (!Cools.isEmpty(condition)) {
             wrapper.like(Tag::getId, condition);
         }
-        manTagService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+        tagService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
         return R.ok().add(vos);
     }
 
@@ -168,7 +168,7 @@
         }
         List<MatPrint> res = new ArrayList<>();
         for (String matnr : param){
-            Mat mat = manMatService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
             // 鎵撳嵃鏁版嵁娉ㄥ叆
             MatPrint print = new MatPrint();
             print.setMatnr(mat.getMatnr());
@@ -220,7 +220,7 @@
         LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<Mat>()
                 .like(Mat::getMatnr, condition).or().like(Mat::getMaktx, condition)
                 .orderByAsc(Mat::getCreateTime);
-        List<Mat> mats = manMatService.page(new Page<>(1, 30), wrapper).getRecords();
+        List<Mat> mats = matService.page(new Page<>(1, 30), wrapper).getRecords();
         List<KeyValueVo> valueVos = new ArrayList<>();
         for (Mat mat : mats) {
             KeyValueVo vo = new KeyValueVo();

--
Gitblit v1.9.1