Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java

@@ -264,7 +264,7 @@ public class WorkPlan extends BaseEntity {
 	 * 占用设备资源ID
 	 */
 	@Schema(description = "占用设备资源ID")
-	private Long equipResourceId;
+	private String equipResourceId;
 
 	/**
 	 * 占用人力资源ID

blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesApprovalRecordController.java

@@ -63,7 +63,7 @@ public class MesApprovalRecordController extends BladeController {
 	@GetMapping("/pageMyApprovalRecord")
 	@Operation(summary = "获取我的审批分页", description  = "传入mesApprovalRecord")
 	public R<IPage<MyMesApprovalRecordVO>> pageMyApprovalRecord(MyMesApprovalRecordVO mesApprovalRecord, Query query) {
-		mesApprovalRecord.setNextRoleId(Long.parseLong(AuthUtil.getUser().getRoleId()));
+//		mesApprovalRecord.setNextRoleId(Long.parseLong(AuthUtil.getUser().getRoleId()));
 		Page<MesApprovalRecordEntity> page = new Page<>(query.getCurrent(), query.getSize());
 		IPage<MyMesApprovalRecordVO> pages = mesApprovalRecordService.selectMyMesApprovalRecordPage(page, mesApprovalRecord);
 		return R.data(pages);

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -144,6 +144,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IDsProcessMeasuringToolService processMeasuringToolService;
 
+    private final IInspectionItemService inspectionService;
+
     @Override
     public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
         return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@@ -1607,10 +1609,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             WorkPlanItem workPlanItem;
             List<WorkPlanItemDetail> workPlanItemDetails = new ArrayList<>();
             WorkPlanItemDetail workPlanItemDetail;
+            List<InspectionItem> inspectionItems = inspectionService.list();
             for (DsProcessProjectEntity project : projects) {
                 workPlanItem = new WorkPlanItem();
                 workPlanItem.setWpId(workPlan.getId());
-                workPlanItem.setItemCode(project.getProjectCode());
+                workPlanItem.setItemCode(project.getTrialNo());
                 workPlanItem.setItemName(project.getProjectName());
                 if (project.getProjectStandard() != null) {
                     workPlanItem.setStandardId(Long.parseLong(project.getProjectStandard()));
@@ -1619,7 +1622,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 workPlanItem.setHourQuota(project.getProHours());
                 workPlanItem.setHourPrepare(project.getPrepareHours());
                 workPlanItem.setTaskId(inspectionTask.getId());
-                workPlanItem.setItemId(project.getId());
+                // 检验项目基础数据中项目名称匹配
+                for (InspectionItem inspectionItem : inspectionItems) {
+                    if (inspectionItem.getName().equals(project.getProjectName())) {
+                        workPlanItem.setItemId(inspectionItem.getId());
+                        break;
+                    }
+                }
                 workPlanItems.add(workPlanItem);
             }
             workPlanItemService.saveBatch(workPlanItems);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java

@@ -9,7 +9,6 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.quality.excel.InspectionItemExcel;
 import org.springblade.desk.quality.pojo.entity.InspectionItem;
 import org.springblade.desk.quality.pojo.vo.InspectionItemVO;
-import org.springblade.desk.quality.pojo.vo.ReviewDutyVO;
 
 import java.util.List;