zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：物料管理业务逻辑修改。新增库存数据统计查询

Browse Source
This commit is contained in:
yd
2025-12-11 16:32:57 +08:00
parent 6a3d585802
commit 33543e5330
18 changed files with 120 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckController.java
View File

@@ -123,4 +123,13 @@ public class MaterialInventoryCheckController extends AbstractFileUploadControll
return success(materialInventoryCheckService.createMaterialInventoryCheckForm(createReqVO));
}
@GetMapping("/get-form")
@Operation(summary = "获得库存盘点")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')")
public CommonResult<MaterialInventoryCheckRespVO> getMaterialInventoryCheckForm(@RequestParam("id") Long id) {
return success(materialInventoryCheckService.getMaterialInventoryCheckForm(id));
}
}

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundController.java
View File

@@ -119,8 +119,9 @@ public class MaterialInventoryInboundController extends AbstractFileUploadContro
@PostMapping("/multi-put")
@Operation(summary = "批量上架")
public CommonResult<PageResult<MaterialInventoryInboundRespVO>> createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
return success(materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO));
public CommonResult<Boolean> createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO);
return success(true);
}
@PostMapping("single-put")

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

@@ -115,4 +115,10 @@ public class MaterialInventoryInboundDetailController extends AbstractFileUpload
BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
}
@GetMapping("/page-list")
@Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryInboundDetailPageList(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
PageResult<MaterialInventoryInboundDetailRespVO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPageList(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
}
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationPageReqVO.java
View File

@@ -79,7 +79,7 @@ public class MaterialInfomationPageReqVO extends PageParam {
List<Long> productIds;
@Schema(description = "入库id")
private long inventoryInboundId;
private Long inventoryInboundId;
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckPageReqVO.java
View File

@@ -54,4 +54,6 @@ public class MaterialInventoryCheckPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "主键")
private Long id;
}

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailPageReqVO.java
View File

@@ -50,4 +50,7 @@ public class MaterialInventoryInboundDetailPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "物料大类Id")
private Long productId;
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java
View File

@@ -63,4 +63,6 @@ public class MaterialInventoryInboundDetailRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
private Long productId;
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchAssignDO.java
View File

@@ -37,7 +37,7 @@ public class MaterialBatchAssignDO extends BusinessBaseDO {
* 产品id
*/
@TableField("PDT_ID")
private String productId;
private Long productId;
/**
* 库房ID
*/

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java
View File

@@ -44,7 +44,10 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
default PageResult<MaterialInfomationDO> selectAll(MaterialInfomationPageReqVO reqVO) {
reqVO.setPageSize(-1);
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInfomationDO>()
.eq(MaterialInfomationDO::getInventoryInboundId, reqVO.getInventoryInboundId()
.eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId())
.eqIfPresent(MaterialInfomationDO::getBatchId, reqVO.getBatchId())
.eqIfPresent(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus())
.eqIfPresent(MaterialInfomationDO::getInventoryInboundId, reqVO.getInventoryInboundId()
)
);
}

18
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java
View File

@@ -3,10 +3,19 @@ package com.zt.plat.module.qms.resource.material.dal.mapper;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataExtendRespVO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO;
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Mapper
*
@@ -32,4 +41,13 @@ public interface MaterialInventoryInboundDetailMapper extends BaseMapperX<Materi
.orderByDesc(MaterialInventoryInboundDetailDO::getId));
}
default PageResult<MaterialInventoryInboundDetailRespVO> selectPageList(MaterialInventoryInboundDetailPageReqVO reqVO) {
return selectJoinPage(reqVO, MaterialInventoryInboundDetailRespVO.class, new MPJLambdaWrapperX<MaterialInventoryInboundDetailDO>()
.selectAll(MaterialInventoryInboundDetailDO.class)
.selectAs(MaterialInfomationDO::getProductId, MaterialInventoryInboundDetailRespVO::getProductId)
.leftJoin(MaterialInfomationDO.class, MaterialInfomationDO::getId, MaterialInventoryInboundDetailDO::getMaterialInfomationId)
.eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId())
);
}
}

Some files were not shown because too many files have changed in this diff Show More