From 29bc0e7f8558a5c053958ad63005363ded9f4f8b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 15:32:56 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java | 4 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java | 18 ++++----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java | 26 ++++++------
zy-asrs-wms/src/main/webapp/views/tag/tag.html | 0
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 12 +++---
zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml | 2
/dev/null | 5 --
zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 6 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 6 +-
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 0
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java | 6 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java | 6 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java | 12 ++++++
zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml | 2
18 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
index ee86eb7..5632f3c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
@@ -6,9 +6,9 @@
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.mapper.ManTagMapper;
-import com.zy.asrs.common.wms.service.ManMatService;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.mapper.TagMapper;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
@@ -54,9 +54,9 @@
*/
@Override
public void invoke(MatExcel excel, AnalysisContext ctx) {
- ManTagService tagService = SpringUtils.getBean(ManTagService.class);
- ManTagMapper tagMapper = SpringUtils.getBean(ManTagMapper.class);
- ManMatService matService = SpringUtils.getBean(ManMatService.class);
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ TagMapper tagMapper = SpringUtils.getBean(TagMapper.class);
+ MatService matService = SpringUtils.getBean(MatService.class);
Date now = new Date();
Long tagId;
// 鍒嗙被
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
index bd57c32..035155c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
@@ -1,7 +1,7 @@
package com.zy.asrs.common.utils;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.common.SpringUtils;
/**
@@ -14,7 +14,7 @@
public StringBuilder pathName = new StringBuilder();
public void executePath(Tag tag) {
- ManTagService bean = SpringUtils.getBean(ManTagService.class);
+ TagService bean = SpringUtils.getBean(TagService.class);
Tag parent = bean.getById(tag.getParentId());
if (null != parent) {
path.insert(0, parent.getId()).insert(0,",");
@@ -29,7 +29,7 @@
}
public void executePath(Long parentId) {
- ManTagService bean = SpringUtils.getBean(ManTagService.class);
+ TagService bean = SpringUtils.getBean(TagService.class);
Tag parent = bean.getById(parentId);
if (null != parent) {
path.insert(0, parent.getId()).insert(0,",");
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
index f1db360..12dd474 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.TagService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@
public class TreeUtils {
@Autowired
- private ManTagService tagService;
+ private TagService tagService;
/******************************** 褰掔被鏍� *********************************/
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
index 7fc00e0..da8a7f0 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
@@ -8,7 +8,7 @@
import com.zy.asrs.common.sys.service.UserLoginService;
import com.zy.asrs.common.sys.service.UserService;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.controller.AbstractBaseController;
@@ -35,7 +35,7 @@
@Autowired
private UserLoginService userLoginService;
@Autowired
- private ManTagService manTagService;
+ private TagService tagService;
protected Long getHostId(){
if (getUserId() == 9527) {
@@ -122,7 +122,7 @@
}
protected Tag getOriginTag(){
- return manTagService.getTop();
+ return tagService.getTop();
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 767a28c..814a247 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,7 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.TagService;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -338,8 +338,8 @@
// );
public String getTagId$(){
- ManTagService manTagService = SpringUtils.getBean(ManTagService.class);
- Tag tag = manTagService.getById(this.tagId);
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ Tag tag = tagService.getById(this.tagId);
if (!Cools.isEmpty(tag)){
return String.valueOf(tag.getId());
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManMatMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
similarity index 82%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManMatMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
index 48a77af..8db3608 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManMatMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
@@ -7,6 +7,6 @@
@Mapper
@Repository
-public interface ManMatMapper extends BaseMapper<Mat> {
+public interface MatMapper extends BaseMapper<Mat> {
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManTagMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
similarity index 82%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManTagMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
index a234859..8c02735 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManTagMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
@@ -7,6 +7,6 @@
@Mapper
@Repository
-public interface ManTagMapper extends BaseMapper<Tag> {
+public interface TagMapper extends BaseMapper<Tag> {
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManMatService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
similarity index 72%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManMatService.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
index 9e5f8a3..1c2b27c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManMatService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
@@ -3,6 +3,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.common.wms.entity.Mat;
-public interface ManMatService extends IService<Mat> {
+public interface MatService extends IService<Mat> {
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManTagService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
similarity index 75%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManTagService.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
index fcac4ee..1ab1cba 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManTagService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.common.wms.entity.Tag;
-public interface ManTagService extends IService<Tag> {
+public interface TagService extends IService<Tag> {
Tag getTop();
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManMatServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManMatServiceImpl.java
deleted file mode 100644
index 92cac63..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManMatServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.ManMatMapper;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.service.ManMatService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("manMatService")
-public class ManMatServiceImpl extends ServiceImpl<ManMatMapper, Mat> implements ManMatService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java
new file mode 100644
index 0000000..165da66
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.service.impl;
+
+import com.zy.asrs.common.wms.mapper.MatMapper;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.service.MatService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("manMatService")
+public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManTagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
similarity index 81%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManTagServiceImpl.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
index 9fbb491..5ebfb62 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManTagServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.mapper.ManTagMapper;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.mapper.TagMapper;
+import com.zy.asrs.common.wms.service.TagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.stereotype.Service;
@Service("manTagService")
-public class ManTagServiceImpl extends ServiceImpl<ManTagMapper, Tag> implements ManTagService {
+public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
@Override
public synchronized Tag getTop() {
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ManMatMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ManMatMapper.xml
deleted file mode 100644
index 6d5e898..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ManMatMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.wms.mapper.ManMatMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
similarity index 71%
copy from zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml
copy to zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
index 0337435..20a4c8a 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.wms.mapper.ManTagMapper">
+<mapper namespace="com.zy.asrs.common.wms.mapper.MatMapper">
</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
similarity index 71%
rename from zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml
rename to zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
index 0337435..32a7949 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ManTagMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.wms.mapper.ManTagMapper">
+<mapper namespace="com.zy.asrs.common.wms.mapper.TagMapper">
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java
index 7dee068..7ea510d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.service.ManMatService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -19,12 +19,12 @@
public class ManMatController extends BaseController {
@Autowired
- private ManMatService manMatService;
+ private MatService matService;
@RequestMapping(value = "/manMat/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(manMatService.getById(id));
+ return R.ok(matService.getById(id));
}
@RequestMapping(value = "/manMat/page/auth")
@@ -42,14 +42,14 @@
wrapper.ge(Mat::getCreateTime, DateUtils.convert(range[0]));
wrapper.le(Mat::getCreateTime, DateUtils.convert(range[1]));
}
- return R.ok(manMatService.page(new Page<>(curr, limit), wrapper));
+ return R.ok(matService.page(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/manMat/add/auth")
@ManagerAuth
public R add(Mat mat) {
- manMatService.save(mat);
+ matService.save(mat);
return R.ok();
}
@@ -59,7 +59,7 @@
if (Cools.isEmpty(mat) || null== mat.getId()){
return R.error();
}
- manMatService.updateById(mat);
+ matService.updateById(mat);
return R.ok();
}
@@ -67,7 +67,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- manMatService.removeById(id);
+ matService.removeById(id);
}
return R.ok();
}
@@ -77,7 +77,7 @@
public R query(String condition) {
LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
wrapper.like(Mat::getId, condition);
- Page<Mat> page = manMatService.page(new Page<>(0, 10), wrapper);
+ Page<Mat> page = matService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -96,7 +96,7 @@
if (!Cools.isEmpty(condition)) {
wrapper.like(Mat::getId, condition);
}
- manMatService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
return R.ok().add(vos);
}
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();
diff --git a/zy-asrs-wms/src/main/webapp/views/manMat/manMat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
similarity index 100%
rename from zy-asrs-wms/src/main/webapp/views/manMat/manMat.html
rename to zy-asrs-wms/src/main/webapp/views/mat/mat.html
diff --git a/zy-asrs-wms/src/main/webapp/views/manTag/manTag.html b/zy-asrs-wms/src/main/webapp/views/tag/tag.html
similarity index 100%
rename from zy-asrs-wms/src/main/webapp/views/manTag/manTag.html
rename to zy-asrs-wms/src/main/webapp/views/tag/tag.html
--
Gitblit v1.9.1