diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java new file mode 100644 index 00000000..47e8b500 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java @@ -0,0 +1,71 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.appservice; + +import javax.servlet.http.HttpServletRequest; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.openhis.web.inventorymanage.dto.*; + +/** + * 采购入库明细查询 service + * + * @author + * @date 2025-03-10 + */ +public interface IInventoryDetailsAppService { + + /** + * 采购入库查询 + * + * @param purchaseInSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 采购入库查询分页列表 + */ + IPage purchaseInGetPage(PurchaseInSearchParam purchaseInSearchParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request); + + /** + * 领用出库查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 领用出库查询分页列表 + */ + IPage requisitionOutGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request); + + /** + * 商品调拨查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 商品调拨查询分页列表 + */ + IPage inventoryTransferGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request); + + /** + * 商品盘点查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 商品盘点查询分页列表 + */ + IPage inventoryStockTakeGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request); + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java new file mode 100644 index 00000000..b4ac60f3 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java @@ -0,0 +1,133 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.appservice.impl; + +import java.util.Arrays; +import java.util.HashSet; + +import javax.servlet.http.HttpServletRequest; + +import com.openhis.web.inventorymanage.dto.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService; +import com.openhis.web.inventorymanage.mapper.InventoryDetailsMapper; + +/** + * 采购入库明细查询 impl + * + * @author + * @date 2025-03-10 + */ +@Service +public class InventoryDetailsAppServiceImpl implements IInventoryDetailsAppService { + + @Autowired + private InventoryDetailsMapper inventoryDetailsMapper; + + /** + * 采购入库明细查询 + * + * @param purchaseInSearchParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 采购入库明细分页列表 + */ + @Override + public IPage purchaseInGetPage(PurchaseInSearchParam purchaseInSearchParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request) { + + // 构建查询条件 + // QueryWrapper queryWrapper = + // HisQueryUtils.buildQueryWrapper(inventorySearchParam, searchKey, searchFields, request); + // 查询入库单据分页列表 + // Page inventoryReceiptPage = purchaseInventoryMapper.selectInventoryReceiptPage( + // new Page<>(pageNo, pageSize), queryWrapper, SupplyType.PURCHASE_INVENTORY.getValue()); + // return R.ok(inventoryReceiptPage); + + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(purchaseInSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no","item_name","item_no")), request); + Page purchaseInInfo = + inventoryDetailsMapper.selectPurchaseInDetailsPage(new Page<>(pageNo, pageSize), queryWrapper); + + return purchaseInInfo; + } + + /** + * 领用出库明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 领用出库明细分页列表 + */ + @Override + public IPage requisitionOutGetPage(RequisitionOutSearchParam requisitionOutSearchParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request) { + + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no","item_name","item_no")), request); + + Page requisitionOutInfo = + inventoryDetailsMapper.selectRequisitionOutDetailsPage(new Page<>(pageNo, pageSize), queryWrapper); + + return requisitionOutInfo; + } + + /** + * 商品调拨明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 商品调拨明细分页列表 + */ + @Override + public IPage inventoryTransferGetPage(RequisitionOutSearchParam requisitionOutSearchParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request) { + + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no","item_name","item_no")), request); + + Page inventoryTransferInfo = + inventoryDetailsMapper.selectInventoryTransferDetailsPage(new Page<>(pageNo, pageSize), queryWrapper); + + return inventoryTransferInfo; + } + + /** + * 商品调拨明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 商品调拨明细分页列表 + */ + @Override + public IPage inventoryStockTakeGetPage(RequisitionOutSearchParam requisitionOutSearchParam, String searchKey, + Integer pageNo, Integer pageSize, HttpServletRequest request) { + + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(requisitionOutSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no","item_name","item_no")), request); + + Page inventoryStockTakeInfo = + inventoryDetailsMapper.selectInventoryStockTakeDetailsPage(new Page<>(pageNo, pageSize), queryWrapper); + + return inventoryStockTakeInfo; + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java new file mode 100644 index 00000000..8a494e89 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java @@ -0,0 +1,111 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.controller; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.core.common.core.domain.R; +import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService; +import com.openhis.web.inventorymanage.dto.PurchaseInSearchParam; +import com.openhis.web.inventorymanage.dto.RequisitionOutSearchParam; + +import lombok.extern.slf4j.Slf4j; + +/** + * 库存相关明细查询 controller + * + * @author + * @date 2025-03-10 + */ +@RestController +@RequestMapping("/inventory-manage-details") +@Slf4j +public class InventoryDetailsController { + + @Autowired + private IInventoryDetailsAppService inventoryDetailsAppService; + + /** + * 采购入库明细查询 + * + * @param purchaseInSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 采购入库分页列表 + */ + @GetMapping(value = "/purchase-in") + public R purchaseInQueryGetPage(PurchaseInSearchParam purchaseInSearchParam, + @RequestParam(name = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + return R.ok( + inventoryDetailsAppService.purchaseInGetPage(purchaseInSearchParam, searchKey, pageNo, pageSize, request)); + } + + /** + * 领用出库明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 采购入库分页列表 + */ + @GetMapping(value = "/requisition-out") + public R RequisitionOutQueryGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + @RequestParam(name = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + return R.ok(inventoryDetailsAppService.requisitionOutGetPage(requisitionOutSearchParam, searchKey, pageNo, + pageSize, request)); + } + + /** + * 商品调拨明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 商品调拨分页列表 + */ + @GetMapping(value = "/inventory-transfer") + public R InventoryTransferQueryGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + @RequestParam(name = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + return R.ok(inventoryDetailsAppService.inventoryTransferGetPage(requisitionOutSearchParam, searchKey, pageNo, + pageSize, request)); + } + + /** + * 商品盘点明细查询 + * + * @param requisitionOutSearchParam 查询条件 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param searchKey 模糊查询关键字 + * @param request 请求数据 + * @return 商品盘点分页列表 + */ + @GetMapping(value = "/inventory-stock-take") + public R InventoryStockTakeQueryGetPage(RequisitionOutSearchParam requisitionOutSearchParam, + @RequestParam(name = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + return R.ok(inventoryDetailsAppService.inventoryStockTakeGetPage(requisitionOutSearchParam, searchKey, pageNo, + pageSize, request)); + } + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java new file mode 100644 index 00000000..f50e3dbc --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java @@ -0,0 +1,93 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import com.sun.jna.platform.unix.solaris.LibKstat; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 商品盘点 + * + * @author + * @date 2025-03-15 + */ +@Data +@Accessors(chain = true) +public class InventoryStockTakeDetailDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 单据号 */ + private String busNo; + + /** 状态 */ + private String statusEnum; + + /** 项目类型 */ + private String itemTable; + + /** 物品编码 */ + private Long itemNo; + + /** 项目名称 */ + private String itemName; + + /** 项目规格 */ + private String itemVolume; + + /** 产品批号 */ + private String lotNumber; + + /** 厂家产地 */ + private String manufacturerId; + + /** 物品计量单位 */ + private String unitCode; + + /** 盘前数量 */ + private BigDecimal itemQuantity; + + /** 盘后数量 */ + private BigDecimal itemQuantity1; + + /** 盈亏数量 */ + + /** 盈亏原因 */ + + + + /** 目的仓库类型 */ + private Integer purposeTypeEnum; + + /** 目的仓库 */ + private String purposeName; + + /** 目的仓位 */ + private String purposeStoreName; + + /** 审批时间 */ + private Date approvalTime; + + /** 申请人 */ + private String applicantName; + + /** 审批人 */ + private String approveName; + + /** 租户ID */ + private Integer tenantId; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java new file mode 100644 index 00000000..a591b685 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java @@ -0,0 +1,102 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import com.sun.jna.platform.unix.solaris.LibKstat; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 商品调拨 + * + * @author + * @date 2025-03-15 + */ +@Data +@Accessors(chain = true) +public class InventoryTransferDetailDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 单据号 */ + private String busNo; + + /** 状态 */ + private String statusEnum; + + /** 项目类型 */ + private String itemTable; + + /** 物品编码 */ + private Long itemNo; + + /** 项目名称 */ + private String itemName; + + /** 项目规格 */ + private String itemVolume; + + /** 产品批号 */ + private String lotNumber; + + /** 厂家产地 */ + private String manufacturerId; + + /** 调拨数量 */ + private BigDecimal itemQuantity; + + /** 物品计量单位 */ + private String unitCode; + + /** 采购单价 */ + private BigDecimal price; + + /** 合计金额 总价 */ + private BigDecimal totalPrice; + + /** 源仓库类型 */ + private Integer sourceTypeEnum; + + /** 源仓库 */ + private String sourceName; + + /** 源仓位 */ + private String sourceStoreName; + + /** 目的仓库类型 */ + private Integer purposeTypeEnum; + + /** 目的仓库 */ + private String purposeName; + + /** 目的仓位 */ + private String purposeStoreName; + + /** 审批时间 */ + private Date approvalTime; + + /** 有效期至 */ + private Date occurrenceTime; + + /** 申请人 */ + private String applicantName; + + /** 审批人 */ + private String approveName; + + /** 租户ID */ + private Integer tenantId; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInDetailDto.java new file mode 100644 index 00000000..8f047678 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInDetailDto.java @@ -0,0 +1,89 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 采购入库 + * + * @author + * @date 2025-03-10 + */ +@Data +@Accessors(chain = true) +public class PurchaseInDetailDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 单据号 */ + private String busNo; + + /** 状态 */ + private String statusEnum; + + /** 项目类型 */ + private String itemTable; + + /** 物品编码 */ + private Long itemNo; + + /** 项目名称 */ + private String itemName; + + /** 项目规格 */ + private String itemVolume; + + /** 产品批号 */ + private String lotNumber; + + /** 供应商 */ + private String supName; + + /** 数量 */ + private BigDecimal itemQuantity; + + /** 单价 */ + private BigDecimal price; + + /** 总价 */ + private BigDecimal totalPrice; + + /** 物品计量单位 */ + private String unitCode; + + /** 目的仓库 */ + private String locName; + + /** 目的仓位 */ + private String locstoreName; + + /** 审批时间 */ + private Date approvalTime; + + /** 期望时间 */ + private Date occurrenceTime; + + /** 申请人 */ + private String applicantName; + + /** 审批人 */ + private String approverName; + + /** 租户ID */ + private Integer tenantId; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInSearchParam.java new file mode 100644 index 00000000..3590ef08 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInSearchParam.java @@ -0,0 +1,35 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; + +import org.hibernate.validator.constraints.Length; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 采购入库分页查询条件 + * + * @author + * @date 2025-03-10 + */ +@Data +@Accessors(chain = true) +public class PurchaseInSearchParam implements Serializable { + + /** 单据号 */ + @Length(max = 255) + private String busNo; + + /** 项目编码 */ + @Length(max = 255) + private String id; + + /** 项目类型 */ + // @Length(max = 255) + // private String busNo; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java new file mode 100644 index 00000000..96722923 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java @@ -0,0 +1,89 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 领用出库 + * + * @author + * @date 2025-03-15 + */ +@Data +@Accessors(chain = true) +public class RequisitionOutDetailDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 单据号 */ + private String busNo; + + /** 状态 */ + private String statusEnum; + + /** 项目类型 */ + private String itemTable; + + /** 物品编码 */ + private Long itemNo; + + /** 项目名称 */ + private String itemName; + + /** 项目规格 */ + private String itemVolume; + + /** 项目规格 */ + private String itemId; + + /** 数量 */ + private BigDecimal itemQuantity; + + /** 物品计量单位 */ + private String unitCode; + + /** 产品批号 */ + private String lotNumber; + + /** 采购批次流水号 */ + private String xxxNo; + + /** 目的仓库 */ + private String locName; + + /** 目的仓位 */ + private String locstoreName; + + /** 制单时间 */ + private Date applyTime; + + /** 审批时间 */ + private Date approvalTime; + + /** 领用部门 */ + private String xxxxxOrg; + + /** 申请人 */ + private String applicantName; + + /** 审批人 */ + private String approverName; + + /** 租户ID */ + private Integer tenantId; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java new file mode 100644 index 00000000..62d42d6d --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java @@ -0,0 +1,36 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.dto; + +import java.io.Serializable; +import java.util.Date; + +import org.hibernate.validator.constraints.Length; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 领用出库分页查询条件 + * + * @author + * @date 2025-03-15 + */ +@Data +@Accessors(chain = true) +public class RequisitionOutSearchParam implements Serializable { + + /** 单据号 */ + @Length(max = 255) + private String busNo; + + /** 项目编码 */ + @Length(max = 255) + private String id; + + /** 项目类型 */ +// @Length(max = 255) +// private String busNo; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java new file mode 100644 index 00000000..9994c471 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java @@ -0,0 +1,62 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.inventorymanage.mapper; + +import com.openhis.web.inventorymanage.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +/** + * 采购入库查询用 mapper + * + * @author + * @date 2025-03-10 + */ +@Repository +public interface InventoryDetailsMapper { + + /** + * 查询采购入库分页列表 + * + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 采购入库分页列表 + */ + Page selectPurchaseInDetailsPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 查询领用出库分页列表 + * + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 领用出库分页列表 + */ + Page selectRequisitionOutDetailsPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 查询商品调拨分页列表 + * + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 商品调拨分页列表 + */ + Page selectInventoryTransferDetailsPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 查询商品盘点分页列表 + * + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 商品盘点分页列表 + */ + Page selectInventoryStockTakeDetailsPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml new file mode 100644 index 00000000..7f5faa50 --- /dev/null +++ b/openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml @@ -0,0 +1,212 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue index 5554a0c5..f5f8cc94 100644 --- a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue +++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue @@ -201,7 +201,7 @@ - + { infusionList.value = response.data; }); - listPatientInfusionPerformRecord(createTimeSTime, createTimeETime).then( - (response) => { + listPatientInfusionPerformRecord(createTimeSTime, createTimeETime).then((response) => { historyRecordsList.value = response.data; } ); @@ -456,10 +455,9 @@ function handleSelectionChange(selection) { selection.forEach((item) => { selectedItems.value.add(item); }); - // 更新 selectedGroupIds 和 selectedPrescriptionNos + // 更新 selectedGroupIds selection.forEach((item) => { const groupId = item.groupId; - const prescriptionNo = item.prescriptionNo; // 检查 groupId 是否同时存在 if (selectedGroupIds.value.has(groupId)) { // 如果都存在，则移除它们 @@ -476,16 +474,7 @@ function handleSelectionChange(selection) { }); } function clearSelections() { - // // 清空选中状态 - // selectedItems.value.clear(); - // selectedGroupIds.value.clear(); - // selectedPrescriptionNos.value.clear(); - // // 取消表格所有行的选中状态 - // infusionList.value.forEach(row => { - // tableRef.value.toggleRowSelection(row, false); - // }); dateRangeRight.value = []; - // 检查 currentRow.value 是否存在 if (!currentRow.value) { const createTimeSTime = timeRightStart.value || null; const createTimeETime = timeRightEnd.value || null; @@ -519,6 +508,10 @@ function handleCurrentChange(row) { console.log("当前选中行的数据：", currentRow.value); listPatientInfusionRecord(currentRow.value).then((response) => { infusionList.value = response.data; + // 统计每个 groupId 的行数 + const groupCounts = countGroupRows(infusionList.value); + // 设置每行的标记 + markers.value = getRowMarkers(groupCounts, infusionList.value); }); listPatientInfusionPerformRecord(currentRow.value).then((response) => { historyRecordsList.value = response.data; @@ -544,6 +537,6 @@ getList(); } :deep(.el-table tbody tr:hover > td) { - background-color: unset !important; + background-color: inherit !important; } \ No newline at end of file