Ver Fonte

委外维修的状态调整

lipenghui há 2 meses atrás
pai
commit
0090e43914

+ 7 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -136,6 +136,9 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         IotMaintainDO iotMaintain = BeanUtils.toBean(createReqVO.getMaintain(), IotMaintainDO.class);
         iotMaintain.setFailureCode("GZ"+ 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.setMaintainPerson(SecurityFrameworkUtils.getLoginUserId());
         iotMaintain.setMaintainType("手动新增");
@@ -209,13 +212,16 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         validateIotMaintainExists(updateReqVO.getMaintain().getId());
         // 更新
         IotMaintainDO updateObj = BeanUtils.toBean(updateReqVO.getMaintain(), IotMaintainDO.class);
+        if ("out".equals(updateObj.getType())&&updateObj.getAuditStatus()==20){
+            updateObj.setStatus("finished");
+        }
         iotMaintainMapper.updateById(updateObj);
         //删除工单bom及物料
         iotMaintainBomMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
         iotMaintainMaterialsMapper.delete("maintain_id", String.valueOf(updateObj.getId()));
         //插入工单bom
         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);
         }
         //插入工单物料