feat:库存查询，库存记录查询、入库记录查询

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchAssignController.java

@@ -99,7 +99,7 @@ public class MaterialBatchAssignController extends AbstractFileUploadController
 
     @GetMapping("/get-by-inf")
     @Operation(summary = "获得物料批次分发")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @Parameter(name = "productId", description = "产品大类编号", required = true)
   //  @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')")
     public CommonResult<PageResult<MaterialBatchAssignRespVO>>  getMaterialBatchAssignByInfiId(MaterialBatchAssignPageReqVO pageReqVO) {
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryController.java

@@ -10,11 +10,13 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO;
-import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO;
-import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailSaveReqVO;
+import com.zt.plat.module.qms.resource.material.controller.vo.*;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO;
 import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO;
 import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundDetailService;
+import com.zt.plat.module.qms.resource.material.service.MaterialInventoryService;
+import com.zt.plat.module.qms.resource.material.service.MaterialProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,18 +38,22 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RequestMapping("/qms/resource/material-inventory")
 @Validated
 @FileUploadController(source = "qms.materiainfo")
-public class MaterialInventoryController extends AbstractFileUploadController implements BusinessControllerMarker{
+public class MaterialInventoryController extends AbstractFileUploadController implements BusinessControllerMarker {
 
     static {
         FileUploadController annotation = MaterialInventoryController.class.getAnnotation(FileUploadController.class);
         if (annotation != null) {
-        setFileUploadInfo(annotation);
+            setFileUploadInfo(annotation);
         }
     }
 
     @Resource
     private MaterialInventoryInboundDetailService materialInventoryInboundDetailService;
 
+    @Resource
+    private MaterialInventoryService mterialInventoryService;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
     @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:create')")
@@ -75,7 +81,7 @@ public class MaterialInventoryController extends AbstractFileUploadController im
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
-                @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
+    @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
     public CommonResult<Boolean> deleteMaterialInventoryInboundDetailList(@RequestBody BatchDeleteReqVO req) {
         materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetailListByIds(req.getIds());
         return success(true);
@@ -91,9 +97,9 @@ public class MaterialInventoryController extends AbstractFileUploadController im
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
+    @Operation(summary = "获得库存明细")
 //    @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')")
-    public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryInboundDetailPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
+    public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
         PageResult<MaterialInventoryInboundDetailDO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
     }
@@ -103,12 +109,32 @@ public class MaterialInventoryController extends AbstractFileUploadController im
     @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportMaterialInventoryInboundDetailExcel(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                                          HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<MaterialInventoryInboundDetailDO> list = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryInboundDetailRespVO.class,
-                        BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
+                BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
     }
 
+
+    @GetMapping("/getList")
+    @Operation(summary = "获得库存列表")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<PageResult<MaterialInventoryRespVO>> getMaterialProduct(MaterialInventoryRespVO pageReqVO) {
+
+        PageResult<MaterialInventoryDO> pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class));
+    }
+
+    @GetMapping("/get_mtrl_inf")
+    @Operation(summary = "获取实例列表")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<PageResult<MaterialInventoryRespVO>> getInfomation(MaterialInventoryRespVO pageReqVO) {
+
+        PageResult<MaterialInventoryDO> pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class));
+    }
+
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundDetailController.java

@@ -37,7 +37,7 @@ import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInbound
 
 @Tag(name = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
 @RestController
-@RequestMapping("/qms/material-inventory-inbound-detail")
+@RequestMapping("/qms/resource/material-inventory-inbound-detail")
 @Validated
 @FileUploadController(source = "qms.materialinventoryinbounddetail")
 public class MaterialInventoryInboundDetailController extends AbstractFileUploadController implements BusinessControllerMarker{

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.qms.resource.material.dal.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 入库 Mapper
+ *
+ * @author 后台管理
+ */
+@Mapper
+public interface MaterialInventoryMapper extends BaseMapperX<MaterialInventoryDO> {
+
+//    default PageResult<MaterialInventoryDO> selectPage(MaterialInventoryRespVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryDO>()
+//
+//                .eqIfPresent(MaterialInventoryDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+//                .eqIfPresent(MaterialInventoryDO::getRemark, reqVO.getRemark())
+//                .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime())
+//                .orderByDesc(MaterialInventoryDO::getId));
+//    }
+
+    IPage<MaterialInventoryDO> selectPageList (IPage<?> page,@Param("param")MaterialInventoryRespVO RespVO);
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryService.java

@@ -0,0 +1,26 @@
+package com.zt.plat.module.qms.resource.material.service;
+
+import com.zt.plat.framework.common.pojo.PageResult;
+
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryPageReqVO;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 库存管理 Service 接口
+ *
+ * @author 后台管理
+ */
+public interface MaterialInventoryService {
+
+
+    /**
+     * 单个入库/上架
+     */
+    PageResult<MaterialInventoryDO> getMaterialInventoryPage(MaterialInventoryRespVO  pageReqVO);
+
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryServiceImpl.java

@@ -0,0 +1,30 @@
+package com.zt.plat.module.qms.resource.material.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO;
+import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MaterialInventoryServiceImpl implements MaterialInventoryService{
+    @Resource
+    private MaterialInventoryMapper materialInventoryMapper;
+
+    @Override
+    public PageResult<MaterialInventoryDO> getMaterialInventoryPage(MaterialInventoryRespVO pageReqVO){
+        IPage<MaterialInventoryDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+
+        IPage<MaterialInventoryDO> pageList = materialInventoryMapper.selectPageList(page, pageReqVO);
+        PageResult<MaterialInventoryDO> pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal());
+        return BeanUtils.toBean(pageResult, MaterialInventoryDO.class);
+
+    }
+}