diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java index 5b93c38af..9c9bc195f 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StRealtimeStock.java @@ -69,8 +69,8 @@ public class StRealtimeStock extends TenantEntity { /** * 过期/报废日期 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") @Schema(description = "过期/报废日期") private Date scrapCycle; /** @@ -194,6 +194,12 @@ public class StRealtimeStock extends TenantEntity { @Schema(description = "出库数量") private Double outQuantity; + /** + * 是否量具保养 0否 1是 + */ + @Schema(description = "是否量具保养 0否 1是") + private Integer isMeasureMaintenance; + @TableField(exist = false) private Long outRecordId; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml index e2edfdd1b..db601271a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml @@ -93,6 +93,7 @@ +