|
@@ -136,6 +136,9 @@ public class IotMaintainServiceImpl implements IotMaintainService {
|
|
IotMaintainDO iotMaintain = BeanUtils.toBean(createReqVO.getMaintain(), IotMaintainDO.class);
|
|
IotMaintainDO iotMaintain = BeanUtils.toBean(createReqVO.getMaintain(), IotMaintainDO.class);
|
|
iotMaintain.setFailureCode("GZ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
|
|
iotMaintain.setFailureCode("GZ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
|
|
iotMaintain.setFailureName(createReqVO.getMaintain().getDeviceName()+DateUtil.format(new Date(), "yyyyMMddHHmmss"));
|
|
iotMaintain.setFailureName(createReqVO.getMaintain().getDeviceName()+DateUtil.format(new Date(), "yyyyMMddHHmmss"));
|
|
|
|
+ if (iotMaintain.getAuditStatus()==20&&"out".equals(iotMaintain.getType())){
|
|
|
|
+ iotMaintain.setStatus("finished");
|
|
|
|
+ }
|
|
iotMaintain.setDeleted(false);
|
|
iotMaintain.setDeleted(false);
|
|
iotMaintain.setMaintainPerson(SecurityFrameworkUtils.getLoginUserId());
|
|
iotMaintain.setMaintainPerson(SecurityFrameworkUtils.getLoginUserId());
|
|
iotMaintain.setMaintainType("手动新增");
|
|
iotMaintain.setMaintainType("手动新增");
|
|
@@ -209,13 +212,16 @@ public class IotMaintainServiceImpl implements IotMaintainService {
|
|
validateIotMaintainExists(updateReqVO.getMaintain().getId());
|
|
validateIotMaintainExists(updateReqVO.getMaintain().getId());
|
|
// 更新
|
|
// 更新
|
|
IotMaintainDO updateObj = BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class);
|
|
IotMaintainDO updateObj = BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class);
|
|
|
|
+ if ("out".equals(updateObj.getType())&&updateObj.getAuditStatus()==20){
|
|
|
|
+ updateObj.setStatus("finished");
|
|
|
|
+ }
|
|
iotMaintainMapper.updateById(updateObj);
|
|
iotMaintainMapper.updateById(updateObj);
|
|
//删除工单bom及物料
|
|
//删除工单bom及物料
|
|
iotMaintainBomMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
|
|
iotMaintainBomMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
|
|
iotMaintainMaterialsMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
|
|
iotMaintainMaterialsMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
|
|
//插入工单bom
|
|
//插入工单bom
|
|
List<IotMaintainBomSaveReqVO> maintainMaterials = updateReqVO.getMaintainMaterials();
|
|
List<IotMaintainBomSaveReqVO> maintainMaterials = updateReqVO.getMaintainMaterials();
|
|
- if (CollUtil.isEmpty(maintainMaterials)) {
|
|
|
|
|
|
+ if ("in".equals(updateReqVO.getMaintain().getType())&&CollUtil.isEmpty(maintainMaterials)) {
|
|
throw new ServiceException(IOT_MAINTAIN_NOT_EXISTS);
|
|
throw new ServiceException(IOT_MAINTAIN_NOT_EXISTS);
|
|
}
|
|
}
|
|
//插入工单物料
|
|
//插入工单物料
|