yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改商城购买物料包报错的问题，修改后台查询错误的问题

This commit is contained in:
yangjun 2024-08-13 15:54:57 +08:00
parent dbba0c5545
commit 40450a24e7
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java
View File

@ -148,22 +148,25 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
} }
//根据物料包id和技师id查询技师对应物料包 //根据物料包id和技师id查询技师对应物料包
MaterialArtificer materialArtificer = baseMapper.selectOne(new QueryWrapper<MaterialArtificer>().eq("artificer_id",artificer.getArtificerId()).eq("material_id",material.getId())); MaterialArtificer materialArtificer = baseMapper.selectOne(new QueryWrapper<MaterialArtificer>().eq("artificer_id",artificer.getArtificerId()).eq("material_id",material.getId()));
//修改物料包数量 if(materialArtificer != null && materialArtificer.getResidue() !=null){
materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number))); //修改物料包数量
baseMapper.updateById(materialArtificer); materialArtificer.setResidue(materialArtificer.getResidue().add(new BigDecimal(number)));
//修改剩余量，执行新增历史记录 baseMapper.updateById(materialArtificer);
MaterialRecord materialRecord = new MaterialRecord(); //修改剩余量，执行新增历史记录
materialRecord.setMaterialId(materialArtificer.getMaterialId()); MaterialRecord materialRecord = new MaterialRecord();
materialRecord.setType(1); materialRecord.setMaterialId(materialArtificer.getMaterialId());
materialRecord.setTotal(materialArtificer.getResidue()); materialRecord.setType(1);
materialRecord.setNumber(BigDecimal.valueOf(number)); materialRecord.setTotal(materialArtificer.getResidue());
materialRecord.setUpdateTime(new Date()); materialRecord.setNumber(BigDecimal.valueOf(number));
materialRecord.setCreateTime(new Date()); materialRecord.setUpdateTime(new Date());
materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId())); materialRecord.setCreateTime(new Date());
materialRecord.setArtificerId(materialArtificer.getArtificerId()); materialRecord.setCreateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId())); materialRecord.setArtificerId(materialArtificer.getArtificerId());
materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal()); materialRecord.setUpdateUser(Long.valueOf(materialArtificer.getArtificerId()));
materialRecordService.addMaterialRecord(materialRecord); materialRecord.setRecordDescribe(DateUtil.date()+"通过商城购买"+(materialRecord.getType().equals(1)?"新增剩余数量：":"减少剩余数量：")+materialArtificer.getResidue()+"总和："+materialRecord.getTotal());
materialRecordService.addMaterialRecord(materialRecord);
}
} }
} }

3
src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java
View File

@ -174,6 +174,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
IPage<MaterialArtificerResult> page1 = new Page(page, limit); IPage<MaterialArtificerResult> page1 = new Page(page, limit);
IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer); IPage<MaterialArtificerResult> materialIPage = materialMapper.selectMaterialArtificer(page1,materialArtificer);
for(MaterialArtificerResult par:materialIPage.getRecords()){ for(MaterialArtificerResult par:materialIPage.getRecords()){
if(par.getResidue() == null){
par.setResidue(BigDecimal.ZERO);
}
if(par.getResidue().compareTo(BigDecimal.ZERO)<0){ if(par.getResidue().compareTo(BigDecimal.ZERO)<0){
par.setResidue(BigDecimal.ZERO); par.setResidue(BigDecimal.ZERO);
} }