From f2eebff1b85e3b44bdc00dcd5eb00127edef617f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 15:31:05 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java | 16 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java | 13 -
zy-asrs-wms/src/main/webapp/views/manTag/manTag.html | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManMatServiceImpl.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManMatController.java | 38 +++----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java | 50 +++++-----
zy-asrs-common/src/main/java/manTag.sql | 26 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManTagService.java | 6
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 16 +-
zy-asrs-wms/src/main/webapp/views/manMat/manMat.html | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 15 +--
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java | 8
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManTagServiceImpl.java | 10 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManTagMapper.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ManMatMapper.java | 4
zy-asrs-common/src/main/java/manMat.sql | 26 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ManMatService.java | 4
19 files changed, 121 insertions(+), 133 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
index 5312561..21db862 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
@@ -2,7 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.zy.asrs.common.wms.entity.ManMat;
+import com.zy.asrs.common.wms.entity.Mat;
import lombok.Data;
/**
@@ -12,7 +12,7 @@
*/
@Data
@ExcelIgnoreUnannotated
-public class MatExcel extends ManMat {
+public class MatExcel extends Mat {
@ExcelProperty(index = 0, value = "涓�绾у垎绫�")
private String priClass;
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 200b6cc..ee86eb7 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
@@ -4,8 +4,8 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.entity.MatExcel;
-import com.zy.asrs.common.wms.entity.ManMat;
-import com.zy.asrs.common.wms.entity.ManTag;
+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;
@@ -62,12 +62,12 @@
// 鍒嗙被
// 涓�绾у垎绫�
if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
- ManTag priTag = tagService.getOne(new LambdaQueryWrapper<ManTag>().eq(ManTag::getName, excel.getPriClass()).eq(ManTag::getLevel, 2));
+ Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
if (priTag == null) {
- ManTag top = tagService.getTop();
+ Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
- priTag = new ManTag(
+ priTag = new Tag(
null, // 缂栧彿
excel.getPriClass(), // 鍚嶇О
top.getId(), // 鐖剁骇
@@ -93,11 +93,11 @@
}
}
// 浜岀骇鍒嗙被
- ManTag secTag = tagService.getOne(new LambdaQueryWrapper<ManTag>().eq(ManTag::getName, excel.getPriClass()).eq(ManTag::getLevel, 3));
+ Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 3));
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
- secTag = new ManTag(
+ secTag = new Tag(
null, // 缂栧彿
excel.getSecClass(), // 鍚嶇О
priTag.getId(), // 鐖剁骇
@@ -127,7 +127,7 @@
tagId = tagService.getTop().getId();
}
// 鍟嗗搧
- ManMat mat = matService.getOne(new LambdaQueryWrapper<ManMat>().eq(ManMat::getMatnr, excel.getMatnr()));
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
if (mat == null) {
mat = excel;
mat.setTagId(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 3221fec..bd57c32 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,6 +1,6 @@
package com.zy.asrs.common.utils;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Tag;
import com.zy.asrs.common.wms.service.ManTagService;
import com.zy.asrs.framework.common.SpringUtils;
@@ -13,9 +13,9 @@
public StringBuilder pathName = new StringBuilder();
- public void executePath(ManTag tag) {
+ public void executePath(Tag tag) {
ManTagService bean = SpringUtils.getBean(ManTagService.class);
- ManTag parent = bean.getById(tag.getParentId());
+ Tag parent = bean.getById(tag.getParentId());
if (null != parent) {
path.insert(0, parent.getId()).insert(0,",");
pathName.insert(0, parent.getName()).insert(0,",");
@@ -30,7 +30,7 @@
public void executePath(Long parentId) {
ManTagService bean = SpringUtils.getBean(ManTagService.class);
- ManTag parent = bean.getById(parentId);
+ Tag parent = bean.getById(parentId);
if (null != parent) {
path.insert(0, parent.getId()).insert(0,",");
pathName.insert(0, parent.getName()).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 4979aa4..f1db360 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
@@ -1,7 +1,7 @@
package com.zy.asrs.common.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Tag;
import com.zy.asrs.common.wms.service.ManTagService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
@@ -27,7 +27,7 @@
@Cacheable(cacheNames="tagTree",key="#id")
public ArrayList<Map> getTree(String id){
ArrayList<Map> result = new ArrayList<>();
- ManTag tag = tagService.getById(id);
+ Tag tag = tagService.getById(id);
// 涓昏妭鐐�
Map<String, Object> map = new HashMap<>();
map.put("title", tag.getName());
@@ -45,12 +45,12 @@
/**
* 閫掑綊鑾峰彇瀛愯妭鐐规暟鎹�
*/
- public void dealTag(ManTag parent, List<Map> list) {
- List<ManTag> tags = tagService.list(
- new LambdaQueryWrapper<ManTag>()
- .eq(ManTag::getParentId, parent.getId())
- .eq(ManTag::getStatus, "1"));
- for (ManTag tag : tags) {
+ public void dealTag(Tag parent, List<Map> list) {
+ List<Tag> tags = tagService.list(
+ new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getParentId, parent.getId())
+ .eq(Tag::getStatus, "1"));
+ for (Tag tag : tags) {
Map<String, Object> map = new HashMap<>();
map.put("title", tag.getName());
map.put("id", tag.getId());
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 054566f..7fc00e0 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
@@ -7,7 +7,7 @@
import com.zy.asrs.common.sys.entity.UserLogin;
import com.zy.asrs.common.sys.service.UserLoginService;
import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Tag;
import com.zy.asrs.common.wms.service.ManTagService;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
@@ -121,7 +121,7 @@
return page;
}
- protected ManTag getOriginTag(){
+ protected Tag getOriginTag(){
return manTagService.getTop();
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
similarity index 92%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 93f6194..767a28c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManMat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -5,14 +5,10 @@
import com.zy.asrs.common.wms.service.ManTagService;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -21,11 +17,10 @@
import com.zy.asrs.common.sys.service.UserService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("wms_man_mat")
-public class ManMat implements Serializable {
+public class Mat implements Serializable {
private static final long serialVersionUID = 1L;
@@ -260,9 +255,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public ManMat() {}
+ public Mat() {}
- public ManMat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -302,7 +297,7 @@
this.memo = memo;
}
-// ManMat manMat = new ManMat(
+// Mat manMat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿[闈炵┖]
@@ -344,7 +339,7 @@
public String getTagId$(){
ManTagService manTagService = SpringUtils.getBean(ManTagService.class);
- ManTag tag = manTagService.getById(this.tagId);
+ Tag tag = manTagService.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/entity/ManTag.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
similarity index 91%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManTag.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
index 9b11ae3..dcb2de2 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ManTag.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
@@ -3,14 +3,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -19,11 +15,10 @@
import com.zy.asrs.common.sys.service.UserService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("wms_man_tag")
-public class ManTag implements Serializable {
+public class Tag implements Serializable {
private static final long serialVersionUID = 1L;
@@ -150,9 +145,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public ManTag() {}
+ public Tag() {}
- public ManTag(String uuid,String name,Long parentId,String parentName,String path,String pathName,Integer type,String leading,String img,String brief,Integer count,Integer level,Integer sort,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public Tag(String uuid, String name, Long parentId, String parentName, String path, String pathName, Integer type, String leading, String img, String brief, Integer count, Integer level, Integer sort, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.uuid = uuid;
this.name = name;
this.parentId = parentId;
@@ -174,7 +169,7 @@
this.memo = memo;
}
-// ManTag manTag = new ManTag(
+// Tag manTag = new Tag(
// null, // 缂栧彿
// null, // 鍚嶇О
// null, // 鐖剁骇
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/ManMatMapper.java
index 8d600f1..48a77af 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/ManMatMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.common.wms.mapper;
-import com.zy.asrs.common.wms.entity.ManMat;
+import com.zy.asrs.common.wms.entity.Mat;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface ManMatMapper extends BaseMapper<ManMat> {
+public interface ManMatMapper 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/ManTagMapper.java
index 1fc939e..a234859 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/ManTagMapper.java
@@ -1,12 +1,12 @@
package com.zy.asrs.common.wms.mapper;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Tag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface ManTagMapper extends BaseMapper<ManTag> {
+public interface ManTagMapper 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/ManMatService.java
index 6f74734..9e5f8a3 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/ManMatService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.common.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.ManMat;
+import com.zy.asrs.common.wms.entity.Mat;
-public interface ManMatService extends IService<ManMat> {
+public interface ManMatService 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/ManTagService.java
index 0843b56..fcac4ee 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/ManTagService.java
@@ -1,10 +1,10 @@
package com.zy.asrs.common.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Tag;
-public interface ManTagService extends IService<ManTag> {
+public interface ManTagService extends IService<Tag> {
- ManTag getTop();
+ 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
index 0b5882c..92cac63 100644
--- 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
@@ -1,12 +1,12 @@
package com.zy.asrs.common.wms.service.impl;
import com.zy.asrs.common.wms.mapper.ManMatMapper;
-import com.zy.asrs.common.wms.entity.ManMat;
+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, ManMat> implements 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/ManTagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ManTagServiceImpl.java
index c084e6a..9fbb491 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/ManTagServiceImpl.java
@@ -1,21 +1,21 @@
package com.zy.asrs.common.wms.service.impl;
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.entity.ManTag;
import com.zy.asrs.common.wms.service.ManTagService;
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, ManTag> implements ManTagService {
+public class ManTagServiceImpl extends ServiceImpl<ManTagMapper, Tag> implements ManTagService {
@Override
- public synchronized ManTag getTop() {
- ManTag top = this.getOne(new LambdaQueryWrapper<ManTag>().eq(ManTag::getLevel, 1));
+ public synchronized Tag getTop() {
+ Tag top = this.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getLevel, 1));
if (top == null) {
- top = new ManTag();
+ top = new Tag();
top.setName("鍏ㄩ儴");
top.setType(0);
top.setLevel(1);
diff --git a/zy-asrs-common/src/main/java/manMat.sql b/zy-asrs-common/src/main/java/manMat.sql
index f8d006b..4228b48 100644
--- a/zy-asrs-common/src/main/java/manMat.sql
+++ b/zy-asrs-common/src/main/java/manMat.sql
@@ -1,18 +1,18 @@
--- save manMat record
+-- save mat record
-- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat/manMat.html', 'manMat绠＄悊', null , '2', null , '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat/mat.html', 'manMat绠＄悊', null , '2', null , '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manMat#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'mat#btn-export', '瀵煎嚭', '', '3', '4', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat/manMat.html', N'manMat绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat/mat.html', N'manMat绠＄悊', null, '2', null, '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manMat#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'mat#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/zy-asrs-common/src/main/java/manTag.sql b/zy-asrs-common/src/main/java/manTag.sql
index f9f973a..541fdcd 100644
--- a/zy-asrs-common/src/main/java/manTag.sql
+++ b/zy-asrs-common/src/main/java/manTag.sql
@@ -1,18 +1,18 @@
--- save manTag record
+-- save tag record
-- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag/manTag.html', 'manTag绠＄悊', null , '2', null , '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag/tag.html', 'manTag绠＄悊', null , '2', null , '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'manTag#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'tag#btn-export', '瀵煎嚭', '', '3', '4', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag/manTag.html', N'manTag绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag/tag.html', N'manTag绠＄悊', null, '2', null, '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'manTag#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'tag#btn-export', N'瀵煎嚭', '', '3', '4', '1');
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 632a5d9..7dee068 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
@@ -1,10 +1,8 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.ManMat;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.ManMatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
@@ -35,14 +33,14 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange) {
- LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManMat::getId, condition);
+ wrapper.like(Mat::getId, condition);
}
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(ManMat::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(ManMat::getCreateTime, DateUtils.convert(range[1]));
+ 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));
}
@@ -50,18 +48,18 @@
@RequestMapping(value = "/manMat/add/auth")
@ManagerAuth
- public R add(ManMat manMat) {
- manMatService.save(manMat);
+ public R add(Mat mat) {
+ manMatService.save(mat);
return R.ok();
}
@RequestMapping(value = "/manMat/update/auth")
@ManagerAuth
- public R update(ManMat manMat){
- if (Cools.isEmpty(manMat) || null==manMat.getId()){
+ public R update(Mat mat){
+ if (Cools.isEmpty(mat) || null== mat.getId()){
return R.error();
}
- manMatService.updateById(manMat);
+ manMatService.updateById(mat);
return R.ok();
}
@@ -77,14 +75,14 @@
@RequestMapping(value = "/manMatQuery/auth")
@ManagerAuth
public R query(String condition) {
- LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(ManMat::getId, condition);
- Page<ManMat> page = manMatService.page(new Page<>(0, 10), wrapper);
+ LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(Mat::getId, condition);
+ Page<Mat> page = manMatService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ManMat manMat : page.getRecords()){
+ for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", manMat.getId());
- map.put("value", manMat.getId());
+ map.put("id", mat.getId());
+ map.put("value", mat.getId());
result.add(map);
}
return R.ok(result);
@@ -94,9 +92,9 @@
@ManagerAuth
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManMat::getId, 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())));
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 c17d05c..6b07c5c 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
@@ -8,8 +8,8 @@
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.domain.entity.MatPrint;
import com.zy.asrs.common.utils.*;
-import com.zy.asrs.common.wms.entity.ManMat;
-import com.zy.asrs.common.wms.entity.ManTag;
+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.framework.annotations.ManagerAuth;
@@ -54,14 +54,14 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange) {
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManTag::getId, condition);
+ wrapper.like(Tag::getId, condition);
}
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(ManTag::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(ManTag::getCreateTime, DateUtils.convert(range[1]));
+ 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));
}
@@ -69,18 +69,18 @@
@RequestMapping(value = "/manTag/add/auth")
@ManagerAuth
- public R add(ManTag manTag) {
- manTagService.save(manTag);
+ public R add(Tag tag) {
+ manTagService.save(tag);
return R.ok();
}
@RequestMapping(value = "/manTag/update/auth")
@ManagerAuth
- public R update(ManTag manTag){
- if (Cools.isEmpty(manTag) || null==manTag.getId()){
+ public R update(Tag tag){
+ if (Cools.isEmpty(tag) || null== tag.getId()){
return R.error();
}
- manTagService.updateById(manTag);
+ manTagService.updateById(tag);
return R.ok();
}
@@ -96,14 +96,14 @@
@RequestMapping(value = "/manTagQuery/auth")
@ManagerAuth
public R query(String condition) {
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(ManTag::getId, condition);
- Page<ManTag> page = manTagService.page(new Page<>(0, 10), wrapper);
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(Tag::getId, condition);
+ Page<Tag> page = manTagService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ManTag manTag : page.getRecords()){
+ for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", manTag.getId());
- map.put("value", manTag.getId());
+ map.put("id", tag.getId());
+ map.put("value", tag.getId());
result.add(map);
}
return R.ok(result);
@@ -113,9 +113,9 @@
@ManagerAuth
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManTag::getId, 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())));
return R.ok().add(vos);
@@ -168,7 +168,7 @@
}
List<MatPrint> res = new ArrayList<>();
for (String matnr : param){
- ManMat mat = manMatService.getOne(new LambdaQueryWrapper<ManMat>().eq(ManMat::getMatnr, matnr));
+ Mat mat = manMatService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatPrint print = new MatPrint();
print.setMatnr(mat.getMatnr());
@@ -217,12 +217,12 @@
@RequestMapping("/mat/all/get/kv")
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
- LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<ManMat>()
- .like(ManMat::getMatnr, condition).or().like(ManMat::getMaktx, condition)
- .orderByAsc(ManMat::getCreateTime);
- List<ManMat> mats = manMatService.page(new Page<>(1, 30), wrapper).getRecords();
+ 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<KeyValueVo> valueVos = new ArrayList<>();
- for (ManMat mat : mats) {
+ for (Mat mat : mats) {
KeyValueVo vo = new KeyValueVo();
vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
vo.setValue(mat.getId());
diff --git a/zy-asrs-wms/src/main/webapp/views/manMat/manMat.html b/zy-asrs-wms/src/main/webapp/views/manMat/manMat.html
index 3bddd64..878a4cb 100644
--- a/zy-asrs-wms/src/main/webapp/views/manMat/manMat.html
+++ b/zy-asrs-wms/src/main/webapp/views/manMat/manMat.html
@@ -163,7 +163,7 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/manMat/manMat.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/mat/mat.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script>
<!-- 琛ㄥ崟寮圭獥 -->
diff --git a/zy-asrs-wms/src/main/webapp/views/manTag/manTag.html b/zy-asrs-wms/src/main/webapp/views/manTag/manTag.html
index 3ea7243..c4a0524 100644
--- a/zy-asrs-wms/src/main/webapp/views/manTag/manTag.html
+++ b/zy-asrs-wms/src/main/webapp/views/manTag/manTag.html
@@ -37,7 +37,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="manTag" lay-filter="manTag"></table>
+ <table class="layui-hide" id="tag" lay-filter="tag"></table>
</div>
</div>
</div>
@@ -59,7 +59,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/manTag/manTag.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/tag/tag.js" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
--
Gitblit v1.9.1