pom文件修改

1.量具保养新增弹窗列表字段缺少
2.使用status 查询接口报500

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

@@ -0,0 +1,65 @@
+package org.springblade.desk.device.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+
+/**
+ * 量具库 视图实体类
+ *
+ * @author qyl
+ * @since 2026-01-26
+ */
+@Data
+public class ToolingLibraryVO {
+    @Serial
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @Schema(description = "物料ID")
+    Long goodsId;
+
+    @Schema(description = "仓库ID")
+    Long shId;
+
+    @Schema(description = "库位ID")
+    Long slId;
+
+    @Schema(description = "物料名称")
+    String goodsName;
+
+    @Schema(description = "物料编码")
+    String goodsCode;
+
+    @Schema(description = "物料规格")
+    String specifications;
+
+    @Schema(description = "生产批次号")
+    String piNo;
+
+    @Schema(description = "仓库")
+    String shName;
+
+    @Schema(description = "库位号")
+    String location;
+
+    @Schema(description = "库存数量")
+    String quantity;
+
+    @Schema(description = "等级")
+    String quantityLevel;
+
+    @Schema(description = "金额")
+    Double balanceMoney;
+
+    @Schema(description = "累计使用次数")
+    String sumNum;
+
+}

blade-service/blade-desk/pom.xml

@@ -118,12 +118,12 @@
             <artifactId>aviator</artifactId>
             <version>5.4.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-wms</artifactId>
-            <version>4.6.0.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.springblade</groupId>-->
+        <!--            <artifactId>blade-wms</artifactId>-->
+        <!--            <version>4.6.0.RELEASE</version>-->
+        <!--            <scope>compile</scope>-->
+        <!--        </dependency>-->
     </dependencies>
 
     <build>

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java

@@ -17,8 +17,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel;
 import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery;
-import org.springblade.wms.feign.StRealtimeStockClient;
-import org.springblade.wms.pojo.vo.StRealtimeStockVO;
+import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
+//import org.springblade.wms.feign.StRealtimeStockClient;
+//import org.springblade.wms.pojo.vo.StRealtimeStockVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -50,8 +51,8 @@ public class MeasuringUpkeepController extends BladeController {
     private final IMeasuringUpkeepService measuringUpkeepService;
 
 
-    @Resource
-    private StRealtimeStockClient client;
+//    @Resource
+//    private StRealtimeStockClient client;
     /**
      * 量具保养 详情
      */
@@ -157,20 +158,21 @@ public class MeasuringUpkeepController extends BladeController {
     @GetMapping("/newlyAddedList")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "量具保养新增页面列表", description = "传入stRealtimeStock，默认过滤量具类型仓库，按sumNum排序")
-    public R<IPage<StRealtimeStockVO>> pageToolsData(StRealtimeStockVO stRealtimeStock, Query query) {
+    public R<IPage<ToolingLibraryVO>> pageToolsData(Query query) {
 
         if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) {
-            query.setDescs("sumNum"); // 默认按sumNum降序排序
+            query.setDescs("sum_num"); // 默认按sumNum降序排序
         }
-        R<Page<StRealtimeStockVO>> measuringTools = client.getMeasuringTools(stRealtimeStock, query);
-        Page<StRealtimeStockVO> data = measuringTools.getData();
-        Page<StRealtimeStockVO> pages = new Page<>();
-        // 复制分页属性
-        pages.setRecords(data.getRecords());
-        pages.setTotal(data.getTotal());
-        pages.setCurrent(data.getCurrent());
-        pages.setSize(data.getSize());
-        pages.setPages(data.getPages());
+//        R<Page<StRealtimeStockVO>> measuringTools = client.getMeasuringTools(stRealtimeStock, query);
+//        Page<StRealtimeStockVO> data = measuringTools.getData();
+//        Page<StRealtimeStockVO> pages = new Page<>();
+//        // 复制分页属性
+//        pages.setRecords(data.getRecords());
+//        pages.setTotal(data.getTotal());
+//        pages.setCurrent(data.getCurrent());
+//        pages.setSize(data.getSize());
+//        pages.setPages(data.getPages());
+        IPage<ToolingLibraryVO> pages = measuringUpkeepService.selectToolingLibraryPage(Condition.getPage(query));
         return R.data(pages);
     }
 

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
 
 import java.util.List;
 
@@ -28,6 +29,14 @@ public interface MeasuringUpkeepMapper extends BaseMapper<MeasuringUpkeepEntity>
      */
     List<MeasuringUpkeepVO> selectMeasuringUpkeepPage(IPage page, MeasuringUpkeepQuery query);
 
+    /**
+     * 自定义分页
+     *
+     * @param page 分页参数
+     * @return List<ToolingLibraryVO>
+     */
+    List<ToolingLibraryVO> selectToolingLibraryPage(IPage page);
+
 
     /**
      * 获取导出数据

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

@@ -66,6 +66,33 @@
         <!-- 状态名称映射（可通过字典或计算字段获取） -->
         <result column="status_name" property="statusName"/>
     </resultMap>
+    <!-- 定义结果映射 -->
+    <resultMap id="stRealtimeStockResultMap" type="org.springblade.desk.device.pojo.vo.ToolingLibraryVO">
+        <!-- 基类字段映射 -->
+        <id column="id" property="id"/>
+        <!-- 关联的ST_REALTIME_STOCK表字段映射 -->
+        <result column="goods_id" property="goodsId"/>
+        <result column="sh_id" property="shId"/>
+        <result column="sl_id" property="slId"/>
+
+        <!-- 关联的st_goods表字段映射 -->
+        <result column="goods_name" property="goodsName"/>
+        <result column="goods_code" property="goodsCode"/>
+        <result column="specifications" property="specifications"/>
+
+        <!-- 关联的ST_STOREHOUSE表字段映射 -->
+        <result column="sh_name" property="shName"/>
+
+        <!-- 关联的ST_STORAGE_LOCATION表字段映射 -->
+        <result column="location" property="location"/>
+
+        <!-- ST_REALTIME_STOCK表本身字段映射 -->
+        <result column="pi_no" property="piNo"/>
+        <result column="quantity" property="quantity"/>
+        <result column="quantity_level" property="quantityLevel"/>
+        <result column="balance_money" property="balanceMoney"/>
+        <result column="sum_num" property="sumNum"/>
+    </resultMap>
 
     <!-- 多表联合查询SQL -->
     <select id="selectMeasuringUpkeepPage" resultMap="MeasuringUpkeepVOResultMap">
@@ -93,12 +120,12 @@
 
         FROM MES_MEASURING_UPKEEP mmu
         LEFT JOIN ST_REALTIME_STOCK st ON mmu.mi_id = st.id
-        LEFT JOIN st_goods g ON st.goods_id = g.id
+        LEFT JOIN ST_GOODS g ON st.goods_id = g.id
         LEFT JOIN ST_STOREHOUSE sh ON st.sh_id = sh.id
         LEFT JOIN ST_STORAGE_LOCATION sl ON st.sl_id = sl.id
         <where>
             <if test="query.status != null">
-                AND mmu.status = #{query.statuss}
+                AND mmu.status = #{query.status}
             </if>
             <if test="query.location != null and query.location != ''">
                 AND sl.location LIKE CONCAT('%', CONCAT(#{query.location}, '%'))
@@ -123,6 +150,25 @@
         ORDER BY mmu.create_time DESC
     </select>
 
+    <select id="selectToolingLibraryPage" resultMap="stRealtimeStockResultMap">
+        SELECT
+        st.*,
+        g.goods_name,
+        g.goods_code,
+        g.specifications,
+        sh.sh_name,
+        sl.location
+        FROM ST_REALTIME_STOCK st
+        LEFT JOIN ST_GOODS g ON st.goods_id = g.id
+        LEFT JOIN ST_STOREHOUSE sh ON st.sh_id = sh.id
+        LEFT JOIN ST_STORAGE_LOCATION sl ON st.sl_id = sl.id
+        <where>
+            st.is_deleted = 0
+            AND sh.is_deleted = 0
+            <!-- 2. 固定条件：量具库（对应 StStorehouse.TYPE_RULE = 5） -->
+            AND sh.type = 5
+        </where>
+    </select>
 
     <select id="exportMeasuringUpkeep" resultType="org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel">
         SELECT *

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java

@@ -8,6 +8,7 @@ import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery;
 import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
 
 import java.util.List;
 
@@ -27,6 +28,14 @@ public interface IMeasuringUpkeepService extends BaseService<MeasuringUpkeepEnti
      */
     IPage<MeasuringUpkeepVO> selectMeasuringUpkeepPage(IPage<MeasuringUpkeepVO> page, MeasuringUpkeepQuery measuringUpkeep);
 
+    /**
+     * 自定义分页
+     *
+     * @param page 分页参数
+     * @return IPage<ToolingLibraryVO>
+     */
+    IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page);
+
 
     /**
      * 导出数据

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java

@@ -17,6 +17,7 @@ import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel;
 import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery;
 import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO;
 import org.springblade.desk.device.mapper.MeasuringUpkeepMapper;
+import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
 import org.springblade.desk.device.service.IMeasuringUpkeepService;
 import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
 import org.springblade.system.cache.SysCache;
@@ -67,6 +68,12 @@ public class MeasuringUpkeepServiceImpl extends BaseServiceImpl<MeasuringUpkeepM
         return page.setRecords(dataList);
     }
 
+    @Override
+    public IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page) {
+        List<ToolingLibraryVO> dataList = baseMapper.selectToolingLibraryPage(page);
+        return page.setRecords(dataList);
+    }
+
 
     @Override
     public List<MeasuringUpkeepExcel> exportMeasuringUpkeep(Wrapper<MeasuringUpkeepEntity> queryWrapper) {

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import jakarta.annotation.Resource;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springblade.desk.device.mapper.EquipmentMapper;
 import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.RecorderCompareEntity;
@@ -126,7 +127,7 @@ public class RecorderServiceImpl extends BaseServiceImpl<RecorderMapper, Recorde
                 jsonObject = JSONObject.parseObject(recorderEntity.getMemo(), JSONObject.class);
 
                 if (jsonObject == null) continue;
-                xData.add(recorderEntity.getRecordDate().toString());
+                xData.add(DateFormatUtils.format(recorderEntity.getRecordDate(), "yyyy-MM-dd HH:mm:ss"));
 
                 for (Map.Entry<String, RecorderCompareEntity> var : compreLst.entrySet()) {
                     Double d = 0d;