取消机电仪和生产装置

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -10,9 +10,11 @@ import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbPosition;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
+import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sb.SbInfoService;
@@ -35,6 +37,8 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
     protected SbInfoService sbInfoService;
     @Resource
     protected SysUserService sysUserService;
+    @Resource
+    protected SbPositionMapper sbPositionMapper;
 
     @Override
     public void nonPlanToPlan(RepairApplicationFormDTO model) {
@@ -132,6 +136,16 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue(), model.getApplicationFileList());
         sysFileService.saveFile(model.getId(),SysFileTypeEnum.REPAIR_APPLICATION_FILES.getValue(),model.getReportFileList());
         RepairApplicationForm form = BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class);
+        // 系统自主存储机电仪位号和生产装置
+        form.setParentSbNo(sb.getPositionNo());
+        if(StringUtils.isNotBlank(sb.getPositionId())){
+            // 车间位置
+            SbPosition sbPosition = sbPositionMapper.selectByPrimaryKey(sb.getPositionId());
+            if(sbPosition != null){
+                String topName = sbPositionMapper.selectNameById(sbPosition.getParentId());
+                form.setSbPosition(topName + "->" + sbPosition.getName());
+            }
+        }
         return form;
     }