diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 89e69651..4380fcfa 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -437,7 +437,6 @@ INSERT INTO `jsh_material` VALUES ('619', null, '衣服', null, null, null, null DROP TABLE IF EXISTS `jsh_material_attribute`; CREATE TABLE `jsh_material_attribute` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `attribute_field` varchar(50) DEFAULT NULL COMMENT '属性字段', `attribute_name` varchar(50) DEFAULT NULL COMMENT '属性名', `attribute_value` varchar(500) DEFAULT NULL COMMENT '属性值', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', @@ -448,11 +447,11 @@ CREATE TABLE `jsh_material_attribute` ( -- ---------------------------- -- Records of jsh_material_attribute -- ---------------------------- -INSERT INTO `jsh_material_attribute` VALUES ('1', 'manyColor', '多颜色', '红色|橙色|黄色|绿色|蓝色|紫色', '63', '0'); -INSERT INTO `jsh_material_attribute` VALUES ('2', 'manySize', '多尺寸', 'S|M|L|XL|XXL|XXXL', '63', '0'); -INSERT INTO `jsh_material_attribute` VALUES ('3', 'other1', '自定义1', '小米|华为', '63', '0'); -INSERT INTO `jsh_material_attribute` VALUES ('4', 'other2', '自定义2', null, '63', '0'); -INSERT INTO `jsh_material_attribute` VALUES ('5', 'other3', '自定义3', null, '63', '0'); +INSERT INTO `jsh_material_attribute` VALUES ('1', '多颜色', '红色|橙色|黄色|绿色|蓝色|紫色', '63', '0'); +INSERT INTO `jsh_material_attribute` VALUES ('2', '多尺寸', 'S|M|L|XL|XXL|XXXL', '63', '0'); +INSERT INTO `jsh_material_attribute` VALUES ('3', '自定义1', '小米|华为', '63', '0'); +INSERT INTO `jsh_material_attribute` VALUES ('4', '自定义2', null, '63', '0'); +INSERT INTO `jsh_material_attribute` VALUES ('5', '自定义3', null, '63', '0'); -- ---------------------------- -- Table structure for jsh_material_category diff --git a/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx b/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx index 50125ae1..da2bdd70 100644 Binary files a/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx and b/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx differ diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 021ad9a9..bb0c405a 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1392,4 +1392,11 @@ alter table jsh_person add sort varchar(10) DEFAULT NULL COMMENT '排序' after update jsh_person set enabled=1; alter table jsh_role add enabled bit(1) DEFAULT NULL COMMENT '启用' after description; alter table jsh_role add sort varchar(10) DEFAULT NULL COMMENT '排序' after enabled; -update jsh_role set enabled=1; \ No newline at end of file +update jsh_role set enabled=1; + +-- -------------------------------------------------------- +-- 时间 2022年08月30日 +-- by jishenghua +-- 给产品属性表移除属性字段 +-- -------------------------------------------------------- +alter table jsh_material_attribute drop column attribute_field; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttribute.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttribute.java index 1304428b..17ef0aaa 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttribute.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttribute.java @@ -3,8 +3,6 @@ package com.jsh.erp.datasource.entities; public class MaterialAttribute { private Long id; - private String attributeField; - private String attributeName; private String attributeValue; @@ -21,14 +19,6 @@ public class MaterialAttribute { this.id = id; } - public String getAttributeField() { - return attributeField; - } - - public void setAttributeField(String attributeField) { - this.attributeField = attributeField == null ? null : attributeField.trim(); - } - public String getAttributeName() { return attributeName; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttributeExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttributeExample.java index 5bbd8d46..35759969 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttributeExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttributeExample.java @@ -164,76 +164,6 @@ public class MaterialAttributeExample { return (Criteria) this; } - public Criteria andAttributeFieldIsNull() { - addCriterion("attribute_field is null"); - return (Criteria) this; - } - - public Criteria andAttributeFieldIsNotNull() { - addCriterion("attribute_field is not null"); - return (Criteria) this; - } - - public Criteria andAttributeFieldEqualTo(String value) { - addCriterion("attribute_field =", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldNotEqualTo(String value) { - addCriterion("attribute_field <>", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldGreaterThan(String value) { - addCriterion("attribute_field >", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldGreaterThanOrEqualTo(String value) { - addCriterion("attribute_field >=", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldLessThan(String value) { - addCriterion("attribute_field <", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldLessThanOrEqualTo(String value) { - addCriterion("attribute_field <=", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldLike(String value) { - addCriterion("attribute_field like", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldNotLike(String value) { - addCriterion("attribute_field not like", value, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldIn(List values) { - addCriterion("attribute_field in", values, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldNotIn(List values) { - addCriterion("attribute_field not in", values, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldBetween(String value1, String value2) { - addCriterion("attribute_field between", value1, value2, "attributeField"); - return (Criteria) this; - } - - public Criteria andAttributeFieldNotBetween(String value1, String value2) { - addCriterion("attribute_field not between", value1, value2, "attributeField"); - return (Criteria) this; - } - public Criteria andAttributeNameIsNull() { addCriterion("attribute_name is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialAttributeMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialAttributeMapperEx.java index 12c974aa..646cc1ff 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialAttributeMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialAttributeMapperEx.java @@ -8,7 +8,7 @@ import java.util.List; public interface MaterialAttributeMapperEx { List selectByConditionMaterialAttribute( - @Param("attributeField") String attributeField, + @Param("attributeName") String attributeName, @Param("offset") Integer offset, @Param("rows") Integer rows); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeComponent.java index 5052c246..b290d647 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeComponent.java @@ -31,8 +31,8 @@ public class MaterialAttributeComponent implements ICommonQuery { private List getMaterialList(Map map) throws Exception{ String search = map.get(Constants.SEARCH); - String attributeField = StringUtil.getInfo(search, "attributeField"); - return materialAttributeService.select(attributeField, QueryUtils.offset(map), QueryUtils.rows(map)); + String attributeName = StringUtil.getInfo(search, "attributeName"); + return materialAttributeService.select(attributeName, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java index 35e79ef2..f14214ac 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java @@ -49,6 +49,7 @@ public class MaterialAttributeService { public List getMaterialAttribute() throws Exception{ MaterialAttributeExample example = new MaterialAttributeExample(); example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + example.setOrderByClause("id desc"); List list=null; try{ list=materialAttributeMapper.selectByExample(example); @@ -58,31 +59,11 @@ public class MaterialAttributeService { return list; } - public List select(String attributeField, int offset, int rows) + public List select(String attributeName, int offset, int rows) throws Exception{ - String[] arr = {"manyColor","manySize","other1","other2","other3"}; - Map map = new HashMap<>(); - map.put("manyColor", "多颜色"); - map.put("manySize", "多尺寸"); - map.put("other1", "自定义1"); - map.put("other2", "自定义2"); - map.put("other3", "自定义3"); List list = new ArrayList<>(); try{ - List maList = materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeField, offset, rows); - for(String field: arr) { - MaterialAttribute materialAttribute = new MaterialAttribute(); - materialAttribute.setAttributeField(field); - materialAttribute.setAttributeName(map.get(field)); - for(MaterialAttribute ma: maList) { - if(field.equals(ma.getAttributeField())){ - materialAttribute.setId(ma.getId()); - materialAttribute.setAttributeName(ma.getAttributeName()); - materialAttribute.setAttributeValue(ma.getAttributeValue()); - } - } - list.add(materialAttribute); - } + list = materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeName, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialAttributeMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialAttributeMapper.xml index 4623e9bf..10848ba6 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialAttributeMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialAttributeMapper.xml @@ -3,7 +3,6 @@ - @@ -68,7 +67,7 @@ - id, attribute_field, attribute_name, attribute_value, tenant_id, delete_flag + id, attribute_name, attribute_value, tenant_id, delete_flag select * from jsh_material_attribute ma where 1=1 - - and ma.attribute_field = #{attributeField} + + + and ma.attribute_name like #{bindAttributeName} and ifnull(ma.delete_flag,'0') !='1' order by ma.id desc @@ -18,8 +19,9 @@