入库分页修改，新建表名常量

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java

@@ -30,6 +30,7 @@ import com.openhis.administration.domain.ChargeItemDefApp;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.service.IChargeItemDefAppService;
 import com.openhis.administration.service.IChargeItemDefinitionService;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
@@ -68,7 +69,7 @@ public class ItemDefinitionController {
      */
     @GetMapping(value = "/init")
     public R<?> getInitDefinitionOptions(ItemDefSearchParam itemDefSearchParam) {
-        /// TODO: 2025/2/26  收费项目下拉框 暂未做成用枚举代替，后续替换
+        /// TODO: 2025/2/26 收费项目下拉框 暂未做成用枚举代替，后续替换
         List<ChargeItemOptionDto> chargeItemOptions = new ArrayList<>();
         if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 西药
@@ -155,13 +156,14 @@ public class ItemDefinitionController {
         }
         // 通过 DefinitionType 区分药品定价/器具定价/活动定价
         if (DefinitionTypeEnum.MEDICATION.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
-            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "med_medication_definition");
+            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION);
             chargeItemDefinitionPage = chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper);
         } else if (DefinitionTypeEnum.DEVICE.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
-            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "adm_device_definition");
+            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
             chargeItemDefinitionPage = chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper);
         } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
-            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "wor_activity_definition");
+            queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
             chargeItemDefinitionPage = chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper);
         }
         return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java

@@ -3,7 +3,9 @@
  */
 package com.openhis.web.inventorymanage.controller;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
@@ -25,12 +28,10 @@ import com.openhis.administration.service.IPatientService;
 import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.service.IMedicationService;
-import com.openhis.web.inventorymanage.dto.InventoryDto;
+import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.dto.InventoryReceiptInitDto;
-import com.openhis.web.inventorymanage.dto.InventorySearchParam;
-import com.openhis.web.inventorymanage.dto.SaveInventoryReceiptDto;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.mapper.SupplyRequestMapper;
 import com.openhis.workflow.service.ISupplyRequestService;
@@ -103,12 +104,13 @@ public class PurchaseInventoryController {
         searchFields.add(CommonConstants.FieldName.BusNo);
 
         // 构建查询条件
-        QueryWrapper<InventorySearchParam> queryWrapper =
+        QueryWrapper<SupplyRequest> queryWrapper =
             HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request);
+        // 查询入库单据分页列表
+        Page<InventoryReceiptDto> inventoryReceiptPage =
+            HisPageUtils.selectPage(supplyRequestMapper, queryWrapper, pageNo, pageSize, InventoryReceiptDto.class);
 
-        // Page<InventoryReceiptDto> inventoryReceiptPage= supplyRequestService.page(new
+        return R.ok(inventoryReceiptPage);
-        // Page<>(pageNo,pageSize),queryWrapper);
-        return R.ok();
     }
 
     /**

openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryManageMapper.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.workflow.domain.SupplyRequest;
+
+/**
+ * 库存管理查询用 mapper
+ *
+ * @author zwh
+ * @date 2025-02-25
+ */
+@Repository
+public interface InventoryManageMapper extends BaseMapper<SupplyRequest> {}

openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/InventoryManageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.web.inventorymanage.mapper.InventoryManageMapper">
+
+</mapper>

openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java

@@ -36,6 +36,21 @@ public class CommonConstants {
          * 服务管理
          */
         String ADM_HEALTHCARE_SERVICE = "adm_healthcare_service";
+
+        /**
+         * 药品定义
+         */
+        String MED_MEDICATION_DEFINITION = "med_medication_definition";
+
+        /**
+         * 器材定义
+         */
+        String ADM_DEVICE_DEFINITION = "adm_device_definition";
+
+        /**
+         * 活动定义
+         */
+        String WOR_ACTIVITY_DEFINITION = "wor_activity_definition";
     }
 
     /**