From 1220a136105acd4f6c92180397bb8948a86f7d33 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Fri, 27 Mar 2026 17:30:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=83=BD=E5=8A=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/entity/CraftAbilityEntity.java | 8 ++++++++ .../controller/CraftAbilityController.java | 6 ++++-- .../desk/basic/excel/CraftAbilityExcel.java | 10 ++++++++++ .../main/resources/Excel/QA/工艺能力.xls | Bin 7168 -> 7168 bytes 4 files changed, 22 insertions(+), 2 deletions(-) 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 f75048db2e14d0fc273542bb122b5db1dcff4f0c..5d078234beab6f33b53955c63cf3428ec2ecfe35 100644 GIT binary patch delta 459 zcmZp$Xt3Cj!@_q!$cp#O-aCxU3_u_>xr(KZ@z>;^EY*xAlS^6a87(J&Wj$|W1e7xd z;(!1D|2GBFWF7Dg^!eGeI${@m!!ZkULUyO16Z0z@;H2sAL2_b|{=os$%z}W-rr_4VE7{%tP*D(b zGNXVM6F=7^p%ar?1r4lg8F(0&fpD`hKhPEy1`wYG2qn28d?fkM`Ig`urp*l^OPN?No#8pNce0jv*d&P(HV2@(4~&y9N_cHPB4NWg`GBazg#4!N1_p)(!O2xDb&Lg*f3j3F8ci-`t!Ff!{FU{*&A