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

添加选择商品名称功能

Browse Source
This commit is contained in:
qiankunpingtai
2019-03-18 17:51:30 +08:00
parent 2e26e41a8d
commit d17ad852a5
10 changed files with 434 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -1,6 +1,7 @@
package com.jsh.erp.service.material;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.datasource.entities.Material;
import com.jsh.erp.datasource.entities.MaterialExample;
import com.jsh.erp.datasource.entities.MaterialVo4Unit;
@@ -194,4 +195,8 @@ public class MaterialService {
info.data = data;
return info;
}
public List<Material> getMaterialEnableSerialNumberList(Map<String, Object> parameterMap) {
return materialMapperEx.getMaterialEnableSerialNumberList(parameterMap);
}
}

4
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -172,9 +172,7 @@ public class SerialNumberService {
return null;
}
/**处理商品id*/
if(serialNumberEx.getMaterialId()==null){
serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName()));
}
serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName()));
//删除标记,默认未删除
serialNumberEx.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
//已卖出，默认未否