仓库管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java

@@ -62,6 +62,12 @@ public class ToolingLibraryVO {
     @Schema(description = "累计使用次数")
     String sumNum;
 
+    @Schema(description = "待保养次数")
+    Long stayMaintainNum;
+
+    @Schema(description = "是否量具保养 0否 1是")
+    Integer isMeasureMaintenance;
+
 	@Schema(description = "保养状态")
 	String muStatus;
 

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

@@ -17,7 +17,7 @@
         <result column="MI_ID" property="miId"/>
         <result column="MEMO" property="memo"/>
         <result column="CREATE_MAN" property="createMan"/>
-        <result column="APPROVAL_STATUS" property="approvalStatus"/>
+<!--        <result column="APPROVAL_STATUS" property="approvalStatus"/>-->
 <!--        <result column="RLS_ID" property="rlsId"/>-->
     </resultMap>
 
@@ -37,7 +37,7 @@
         <result column="MI_ID" property="miId"/>
         <result column="MEMO" property="memo"/>
         <result column="CREATE_MAN" property="createMan"/>
-        <result column="APPROVAL_STATUS" property="approvalStatus"/>
+<!--        <result column="APPROVAL_STATUS" property="approvalStatus"/>-->
 <!--        <result column="RLS_ID" property="rlsId"/>-->
 
         <!-- 关联的ST_REALTIME_STOCK表字段映射 -->