From 8f677196616aad0a7aa019210630b46734d09b60 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 26 Mar 2026 15:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E4=BB=BB=E5=8A=A1=E5=88=B0?= =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=EF=BC=8C=E7=89=A9=E6=96=99=E5=AE=9A?= =?UTF-8?q?=E9=A2=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/MaterialQuota.java | 5 +++-- .../desk/quality/pojo/vo/LiquidTankTaskVO.java | 2 ++ .../controller/MaterialQuotaController.java | 16 +++++++++++++++- .../desk/quality/mapper/LiquidTankTaskMapper.xml | 3 ++- .../service/impl/LiquidTankTaskServiceImpl.java | 4 +++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java index d123914a..9bb0b623 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -85,8 +85,8 @@ public class MaterialQuota extends BaseEntity { * 镀层厚度 */ @Schema(description = "镀层厚度") - @JsonSerialize(nullsUsing = NullSerializer.class) - private BigDecimal thickness; +// @JsonSerialize(nullsUsing = NullSerializer.class) + private String thickness; /** * 定额 */ @@ -110,6 +110,7 @@ public class MaterialQuota extends BaseEntity { * 局部镀定额 */ @JsonSerialize(nullsUsing = NullSerializer.class) +// @NullSerializer(NullStringSerializer.class) @Schema(description = "局部镀定额") private BigDecimal localBatQuota; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index 6d6a7548..0445ee8d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -90,5 +90,7 @@ public class LiquidTankTaskVO extends LiquidTankTask { private String drugAddUserSign; @Schema(description = "控制规范(报告)") private String norm; + @Schema(description = "槽液到期时间") + private LocalDate tankEndTime; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 4f51b4b5..b000267a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -43,6 +43,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -163,7 +164,20 @@ public class MaterialQuotaController extends BladeController { @ApiLog(value = "物料定额修改") @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") public R update(@Valid @RequestBody MaterialQuota updateOne) { - return R.status(service.updateById(updateOne)); + if(null == updateOne.getQuota()){ + updateOne.setQuota(new BigDecimal(0)); + } + if(null == updateOne.getSmallBatQuota()){ + updateOne.setSmallBatQuota(new BigDecimal(0)); + } + if(null == updateOne.getBigBatQuota()){ + updateOne.setBigBatQuota(new BigDecimal(0)); + } + if(null == updateOne.getLocalBatQuota()){ + updateOne.setLocalBatQuota(new BigDecimal(0)); + } + service.updateById(updateOne); + return R.status(true); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml index 316e0988..4e5ddc41 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml @@ -71,7 +71,8 @@