wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management

Browse Source
This commit is contained in:
DirectionOfMind 2020-12-29 16:05:09 +08:00
commit 6104cbe47e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/equipment/entity/EquipmentInfoReq.java
View File

@ -68,6 +68,9 @@ public class EquipmentInfoReq implements java.io.Serializable {
private Long brandId; private Long brandId;
//规格id
private Long specsId;
private String gmtInStartTime; private String gmtInStartTime;
private String gmtInEndTime; private String gmtInEndTime;

6
src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java
View File

@ -123,11 +123,12 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
if(info==null || (info!=null && info.getCount()<i)){ if(info==null || (info!=null && info.getCount()<i)){
log.info("change 第" + i + "次盘点"); log.info("change 第" + i + "次盘点");
EquipmentInfo insert = new EquipmentInfo(); EquipmentInfo insert = new EquipmentInfo();
BeanUtils.copyProperties(dto,insert);
insert.setType(equipmentType.getType()); insert.setType(equipmentType.getType());
insert.setBrandName(equipmentBrand.getBrand()); insert.setBrandName(equipmentBrand.getBrand());
insert.setSpecType(equipmentSpecs.getSpecs()); insert.setSpecType(equipmentSpecs.getSpecs());
insert.setEquipmentState(dto.getState()); insert.setEquipmentState(dto.getState());
BeanUtils.copyProperties(dto,insert); insert.setSpecsId(dto.getSpecId());
if(dto.isEmployee()){ if(dto.isEmployee()){
StaffEntity employeesInfo = staffService.selectStaffById(dto.getUserId()); StaffEntity employeesInfo = staffService.selectStaffById(dto.getUserId());
if(employeesInfo==null){ if(employeesInfo==null){
@ -172,6 +173,9 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
} }
info.setType(equipmentType.getType()); info.setType(equipmentType.getType());
info.setBrandName(equipmentBrand.getBrand()); info.setBrandName(equipmentBrand.getBrand());
info.setSpecsId(dto.getSpecId());
info.setBrandId(dto.getBrandId());
info.setTypeId(dto.getTypeId());
info.setSpecType(equipmentSpecs.getSpecs()); info.setSpecType(equipmentSpecs.getSpecs());
info.setQr(dto.getQr()); info.setQr(dto.getQr());
info.setCode(dto.getCode()); info.setCode(dto.getCode());