From c79d065dc01fe7489d16361d5bd613b554af5d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 4 Aug 2021 23:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=A4=9A?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/docs/jsh_erp.sql | 4 ++-- .../docs/数据库更新记录-首次安装请勿使用.txt | 4 ++-- .../erp/service/material/MaterialService.java | 6 +++++- .../MaterialAttributeService.java | 21 ++++++++++++++----- .../resources/mapper_xml/MaterialMapperEx.xml | 4 ++-- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index cc26e546..b2ec35be 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -434,8 +434,8 @@ 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 ('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'); diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 0a7b1568..f4a71e64 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1143,8 +1143,8 @@ CREATE TABLE `jsh_material_attribute` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='产品属性表'; -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 ('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'); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 91d1f19c..fe960b76 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -791,7 +791,11 @@ public class MaterialService { public String getMaxBarCode() { String maxBarCodeOld = materialMapperEx.getMaxBarCode(); - return Long.parseLong(maxBarCodeOld)+""; + if(StringUtil.isNotEmpty(maxBarCodeOld)) { + return Long.parseLong(maxBarCodeOld)+""; + } else { + return "1000"; + } } public List getMaterialNameList() { 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 253aa957..8de07179 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 @@ -193,12 +193,23 @@ public class MaterialAttributeService { } public String getNameByField(String field) { - MaterialAttribute ma = getInfoByField(field); - if(ma!=null) { - return ma.getAttributeName(); - } else { - return null; + String res = ""; + if("manyColor".equals(field)){ + res = "多颜色"; + } else if("manySize".equals(field)){ + res = "多尺寸"; + } else if("other1".equals(field)){ + res = "自定义1"; + } else if("other2".equals(field)){ + res = "自定义2"; + } else if("other3".equals(field)){ + res = "自定义3"; } + MaterialAttribute ma = getInfoByField(field); + if(ma!=null && StringUtil.isNotEmpty(ma.getAttributeName())) { + res = ma.getAttributeName(); + } + return res; } public JSONArray getValueArrByField(String field) { diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index b6ac2b88..302d2e5d 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -276,9 +276,9 @@