Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理-检查项维护(修改BUG修复)

Browse Source
highway
wws 1 year ago
parent 8b3acc99b7
commit 40f0238071
1 changed files with 202 additions and 206 deletions
Show Stats Download Patch File Download Diff File

22
op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
Unescape Escape View File

@ -55,7 +55,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
// 创建返回对象 // 创建返回对象
EquCheckItemVO equCheckItemVO = new EquCheckItemVO(); EquCheckItemVO equCheckItemVO = new EquCheckItemVO();
BeanUtils.copyProperties(equCheckItem,equCheckItemVO); BeanUtils.copyProperties(equCheckItem, equCheckItemVO);
equCheckItemVO.setFormStandard(equCheckItemDetailMapper.selectEquCheckItemDetailByParentCode(equCheckItem.getItemCode())); equCheckItemVO.setFormStandard(equCheckItemDetailMapper.selectEquCheckItemDetailByParentCode(equCheckItem.getItemCode()));
@ -107,7 +107,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
} }
// 创建检查项对象 // 创建检查项对象
EquCheckItem equCheckItem = new EquCheckItem(); EquCheckItem equCheckItem = new EquCheckItem();
BeanUtils.copyProperties(equCheckItemDTO,equCheckItem); BeanUtils.copyProperties(equCheckItemDTO, equCheckItem);
//获取当前所选工厂 //获取当前所选工厂
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@ -122,7 +122,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
// 处理检查项信息 // 处理检查项信息
equCheckItem.setItemId(IdUtils.fastSimpleUUID()); equCheckItem.setItemId(IdUtils.fastSimpleUUID());
equCheckItem.setFactoryCode(factory); equCheckItem.setFactoryCode(factory);
equCheckItem.setItemCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum); equCheckItem.setItemCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum);
equCheckItem.setCreatedBy(SecurityContextHolder.getUserName()); equCheckItem.setCreatedBy(SecurityContextHolder.getUserName());
equCheckItem.setCreatedTime(DateUtils.getNowDate()); equCheckItem.setCreatedTime(DateUtils.getNowDate());
equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName());
@ -148,7 +148,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
detail.setDetailId(IdUtils.fastSimpleUUID()); detail.setDetailId(IdUtils.fastSimpleUUID());
detail.setParentCode(equCheckItem.getItemCode()); detail.setParentCode(equCheckItem.getItemCode());
detail.setFactoryCode(factory); detail.setFactoryCode(factory);
detail.setDetailCode(equCheckItem.getItemCode()+detailSerialNum); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum);
detail.setCreatedBy(SecurityContextHolder.getUserName()); detail.setCreatedBy(SecurityContextHolder.getUserName());
detail.setCreatedTime(DateUtils.getNowDate()); detail.setCreatedTime(DateUtils.getNowDate());
detail.setUpdatedBy(SecurityContextHolder.getUserName()); detail.setUpdatedBy(SecurityContextHolder.getUserName());
@ -171,7 +171,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
@DS("#header.poolName") @DS("#header.poolName")
public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO) { public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO) {
EquCheckItem equCheckItem = new EquCheckItem(); EquCheckItem equCheckItem = new EquCheckItem();
BeanUtils.copyProperties(equCheckItemDTO,equCheckItem); BeanUtils.copyProperties(equCheckItemDTO, equCheckItem);
// 处理检查项信息 // 处理检查项信息
equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName()); equCheckItem.setUpdatedBy(SecurityContextHolder.getUserName());
@ -188,16 +188,17 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
equCheckItemMapper.updateEquCheckItem(equCheckItem); equCheckItemMapper.updateEquCheckItem(equCheckItem);
// 删除所有标准
equCheckItemDetailMapper.deleteEquCheckItemDetailByItemId(equCheckItem.getItemId());
for (EquCheckItemDetail detail : equCheckItemDTO.getFormStandard()) { for (EquCheckItemDetail detail : equCheckItemDTO.getFormStandard()) {
// 标准不存在则新增
if (detail.getDetailCode() == null) {
// 获取标准流水号 // 获取标准流水号
String detailSerialNum = String.format("%03d", equCheckItemDetailMapper.selectSerialNumber(equCheckItem.getItemCode())); String detailSerialNum = String.format("%03d", equCheckItemDetailMapper.selectSerialNumber(equCheckItem.getItemCode()));
detail.setDetailId(IdUtils.fastSimpleUUID()); detail.setDetailId(IdUtils.fastSimpleUUID());
detail.setParentCode(equCheckItem.getItemCode()); detail.setParentCode(equCheckItem.getItemCode());
detail.setFactoryCode(equCheckItem.getFactoryCode()); detail.setFactoryCode(equCheckItem.getFactoryCode());
detail.setDetailCode(equCheckItem.getItemCode()+detailSerialNum); detail.setDetailCode(equCheckItem.getItemCode() + detailSerialNum);
detail.setCreatedBy(SecurityContextHolder.getUserName()); detail.setCreatedBy(SecurityContextHolder.getUserName());
detail.setCreatedTime(DateUtils.getNowDate()); detail.setCreatedTime(DateUtils.getNowDate());
detail.setUpdatedBy(SecurityContextHolder.getUserName()); detail.setUpdatedBy(SecurityContextHolder.getUserName());
@ -205,11 +206,6 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
// 插入到数据库 // 插入到数据库
equCheckItemDetailMapper.insertEquCheckItemDetail(detail); equCheckItemDetailMapper.insertEquCheckItemDetail(detail);
}else {
detail.setUpdatedBy(SecurityContextHolder.getUserName());
detail.setUpdatedTime(DateUtils.getNowDate());
equCheckItemDetailMapper.updateEquCheckItemDetail(detail);
}
} }
return success("修改成功"); return success("修改成功");
} }

Write Preview
Loading…
Cancel
Save