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

解决商品不能录入的问题

Browse Source
This commit is contained in:
季圣华
2018-12-26 23:36:02 +08:00
parent 9790eb6308
commit 00933e4241
5 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,13 +72,21 @@ public class MaterialService {
public int insertMaterial(String beanJson, HttpServletRequest request) {
Material material = JSONObject.parseObject(beanJson, Material.class);
material.setEnabled(true);
return materialMapper.insertSelective(material);
}
public int updateMaterial(String beanJson, Long id) {
Material material = JSONObject.parseObject(beanJson, Material.class);
material.setId(id);
return materialMapper.updateByPrimaryKeySelective(material);
int res = materialMapper.updateByPrimaryKeySelective(material);
Long unitId = material.getUnitid();
if(unitId != null) {
materialMapper.updatePriceNullByPrimaryKey(id); //将价格置空
} else {
materialMapper.updateUnitIdNullByPrimaryKey(id); //将多单位置空
}
return res;
}
public int deleteMaterial(Long id) {
@@ -102,17 +110,18 @@ public class MaterialService {
public int checkIsExist(Long id, String name, String model, String color, String standard, String mfrs,
String otherField1, String otherField2, String otherField3, String unit, Long unitId) {
MaterialExample example = new MaterialExample();
MaterialExample.Criteria criteria = example.createCriteria();
criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
.andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
.andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3);
if (id > 0) {
example.createCriteria().andIdNotEqualTo(id);
criteria.andIdNotEqualTo(id);
}
example.createCriteria().andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
.andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
.andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3);
if (unit !=null) {
example.createCriteria().andUnitEqualTo(unit);
if (!StringUtil.isEmpty(unit)) {
criteria.andUnitEqualTo(unit);
}
if (unitId !=null) {
example.createCriteria().andUnitidEqualTo(unitId);
criteria.andUnitidEqualTo(unitId);
}
List<Material> list = materialMapper.selectByExample(example);
return list.size();