diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java index e3fed4ee..89cbe2bc 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java @@ -96,5 +96,13 @@ public class CraftAbilityEntity extends BaseEntity { private String plannerName; // @TableField(exist = false) private String dispatcherName; + @Schema(description = "局部镀订单面积") + private BigDecimal localArea; + @Schema(description = "外协限制") + private String wxLimit; + @Schema(description = "厂内比例") + private String inRate; + @Schema(description = "外协比例") + private String outRate; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index cab54266..103eb46c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -276,8 +276,10 @@ public class CraftAbilityController extends BladeController { list.forEach(noticeExcel -> { CraftAbilityEntity notice = BeanUtil.copy(noticeExcel, CraftAbilityEntity.class); - String category = DictCache.getKey("ProcessCapabilityType", noticeExcel.getWtName()); - notice.setWtId(Long.valueOf(category)); + if(noticeExcel.getWtName() != null && !"".equals(noticeExcel.getWtName())){ + String category = DictCache.getKey("ProcessCapabilityType", noticeExcel.getWtName()); + notice.setWtId(Long.valueOf(category)); + } noticeList.add(notice); }); return R.data(craftAbilityService.saveBatch(noticeList)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java index 15e9d120..cd22643b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java @@ -30,6 +30,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; @@ -90,4 +91,13 @@ public class CraftAbilityExcel implements Serializable { @ExcelProperty("是否已删除") private Long isDeleted; + @ExcelProperty("局部镀订单面积") + private BigDecimal localArea; + @ExcelProperty("外协限制") + private String wxLimit; + @ExcelProperty("厂内比例") + private String inRate; + @ExcelProperty("外协比例") + private String outRate; + } diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/工艺能力.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/工艺能力.xls index f75048db..5d078234 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/工艺能力.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/工艺能力.xls differ