purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决商品多属性的bug

Browse Source
This commit is contained in:
季圣华
2021-08-04 23:39:34 +08:00
parent 4d126849c3
commit c79d065dc0
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -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<String> getMaterialNameList() {

21
jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java
View File

@@ -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) {

4
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -276,9 +276,9 @@
</select>
<select id="getMaxBarCode" resultType="java.lang.String">
select max(CAST(l.bar_code AS SIGNED)) bar_code from jsh_material_extend l
select max(CAST(me.bar_code AS SIGNED)) bar_code from jsh_material_extend me
where 1=1
and ifnull(l.delete_Flag,'0') !='1'
and ifnull(me.delete_Flag,'0') !='1'
</select>
<select id="getMaterialByMeId" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">