Merge branch 'liweidong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java

@@ -71,21 +71,23 @@ public class DsProcessMeasuringToolEntity extends BaseEntity {
 	private String mtId;
 
 	/**
-	 * 量具ID
+	 * 量具信息
 	 */
-	@Schema(description = "量具ID")
-	private String tool;
+	@Schema(description = "量具信息")
+	private String toolInfo;
 
 	/**
 	 * 量具尺寸
 	 */
 	@Schema(description = "量具尺寸")
 	private String toolSize;
+
 	/**
-	 * 量具信息
+	 * 图纸尺寸
 	 */
-	@Schema(description = "量具信息")
-	private String toolInfo;
+	@Schema(description = "图纸尺寸")
+	private String drawingSize;
+
 	/**
 	 * 备注
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java

@@ -336,9 +336,12 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 			processMoldToolService.deleteLogic(processMoldToolIdList);
 		}
 
-		// 最后删除工序
+		// 删除工序
 		processService.deleteLogic(processIdList);
 
+		// 删除工艺
+		this.deleteLogic(List.of(craftId));
+
 		return true;
 	}
 

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

@@ -146,7 +146,7 @@ public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPla
                                         WorkPlanItemDetailVO item = new WorkPlanItemDetailVO();
                                         item.setTestType("1".equals(toolEntity.getTestType()) ? "镀前" : "镀后");
                                         item.setRuleSize(toolEntity.getToolSize());
-                                        item.setTools(toolEntity.getTool());
+                                        item.setTools(toolEntity.getToolInfo());
                                         item.setMtId(toolEntity.getId());
                                         itemList.add(item);
                                     }

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

@@ -130,7 +130,7 @@ public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl<WorkPlanItemD
                     detail.setTools(item.getTools());
                 }else {
                     DsProcessMeasuringToolEntity toolEntity = processMeasuringToolService.getById(item.getMtId());
-                    detail.setTools(toolEntity != null ? toolEntity.getTool() : null);
+                    detail.setTools(toolEntity != null ? toolEntity.getToolInfo() : null);
                 }
                 this.save(detail);
             });