仓库管理修改

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")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    @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;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml

@@ -93,6 +93,7 @@
         <result column="balance_money" property="balanceMoney"/>
         <result column="sum_num" property="sumNum"/>
         <result column="stay_maintain_num" property="stayMaintainNum"/>
+        <result column="is_measure_maintenance" property="isMeasureMaintenance"/>
     </resultMap>
 
     <!-- 多表联合查询SQL -->