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

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2026-04-07 17:31:09 +08:00
parent 198ab81c31 79a9c5d7fa
commit d12af3b102
17 changed files with 75 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigWarehouseLocationMapper.java
View File

@@ -30,8 +30,13 @@ public interface ConfigWarehouseLocationMapper extends BaseMapperX<ConfigWarehou
MPJLambdaWrapperX<ConfigWarehouseLocationDO> wrapper = new MPJLambdaWrapperX<>();
Boolean adminFlag = reqVO.getAdminFlag();
List<Long> authorizedWarehouseIds = reqVO.getAuthorizedWarehouseIds();
// 非管理员并且没有权限的仓库
if ((adminFlag == null || !adminFlag) && CollUtil.isEmpty(authorizedWarehouseIds))
return new PageResult<>();
//仓库
wrapper.leftJoin(ConfigWarehouseLocationParDO.class, ConfigWarehouseLocationParDO::getId, ConfigWarehouseLocationDO::getParentId);
wrapper.selectAll(ConfigWarehouseLocationDO.class)
.selectAs(ConfigWarehouseLocationParDO::getName, ConfigWarehouseLocationRespVO::getWarehouseName)
.selectAs(ConfigWarehouseLocationParDO::getCode, ConfigWarehouseLocationRespVO::getWarehouseCode)
@@ -48,11 +53,11 @@ public interface ConfigWarehouseLocationMapper extends BaseMapperX<ConfigWarehou
.eqIfPresent(ConfigWarehouseLocationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.betweenIfPresent(ConfigWarehouseLocationDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(ConfigWarehouseLocationDO::getRemark, reqVO.getRemark())
.and(adminFlag == null || !adminFlag && CollUtil.isNotEmpty(reqVO.getAuthorizedWarehouseIds()),
.and(adminFlag == null || !adminFlag && CollUtil.isNotEmpty(authorizedWarehouseIds),
wrapper1 ->
wrapper1.in(ConfigWarehouseLocationDO::getId, reqVO.getAuthorizedWarehouseIds())
wrapper1.in(ConfigWarehouseLocationDO::getId, authorizedWarehouseIds)
.or()
.in(ConfigWarehouseLocationParDO::getId, reqVO.getAuthorizedWarehouseIds()))
.in(ConfigWarehouseLocationParDO::getId, authorizedWarehouseIds))
.orderByDesc(ConfigWarehouseLocationDO::getSortNo);
return selectJoinPage(reqVO, ConfigWarehouseLocationRespVO.class, wrapper);

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/office/supplier/controller/admin/SupplierController.java
View File

@@ -86,7 +86,7 @@ public class SupplierController extends AbstractFileUploadController implements
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除供应商")
@PreAuthorize("@ss.hasPermission('qms:supplier:delete')")
// @PreAuthorize("@ss.hasPermission('qms:supplier:delete')")
public CommonResult<Boolean> deleteSupplierList(@RequestBody BatchDeleteReqVO req) {
supplierService.deleteSupplierListByIds(req.getIds());
return success(true);
@@ -112,7 +112,7 @@ public class SupplierController extends AbstractFileUploadController implements
@GetMapping("/export-excel")
@Operation(summary = "导出供应商 Excel")
@PreAuthorize("@ss.hasPermission('qms:supplier:export')")
// @PreAuthorize("@ss.hasPermission('qms:supplier:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSupplierExcel(@Valid SupplierPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/office/supplier/controller/admin/SupplierEvaluationAtController.java
View File

@@ -57,14 +57,14 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@PostMapping("/create")
@Operation(summary = "创建供应商评价关系")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:create')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:create')")
public CommonResult<SupplierEvaluationAtRespVO> createSupplierEvaluationAt(@Valid @RequestBody SupplierEvaluationAtSaveReqVO createReqVO) {
return success(supplierEvaluationAtService.createSupplierEvaluationAt(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新供应商评价关系")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:update')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:update')")
public CommonResult<Boolean> updateSupplierEvaluationAt(@Valid @RequestBody SupplierEvaluationAtSaveReqVO updateReqVO) {
supplierEvaluationAtService.updateSupplierEvaluationAt(updateReqVO);
return success(true);
@@ -73,7 +73,7 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@DeleteMapping("/delete")
@Operation(summary = "删除供应商评价关系")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:delete')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:delete')")
public CommonResult<Boolean> deleteSupplierEvaluationAt(@RequestParam("id") Long id) {
supplierEvaluationAtService.deleteSupplierEvaluationAt(id);
return success(true);
@@ -82,7 +82,7 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除供应商评价关系")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:delete')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:delete')")
public CommonResult<Boolean> deleteSupplierEvaluationAtList(@RequestBody BatchDeleteReqVO req) {
supplierEvaluationAtService.deleteSupplierEvaluationAtListByIds(req.getIds());
return success(true);
@@ -91,7 +91,7 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@GetMapping("/get")
@Operation(summary = "获得供应商评价关系")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:query')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:query')")
public CommonResult<SupplierEvaluationAtRespVO> getSupplierEvaluationAt(@RequestParam("id") Long id) {
SupplierEvaluationAtDO supplierEvaluationAt = supplierEvaluationAtService.getSupplierEvaluationAt(id);
return success(BeanUtils.toBean(supplierEvaluationAt, SupplierEvaluationAtRespVO.class));
@@ -99,7 +99,7 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@GetMapping("/page")
@Operation(summary = "获得供应商评价关系分页")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:query')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:query')")
public CommonResult<PageResult<SupplierEvaluationAtRespVO>> getSupplierEvaluationAtPage(@Valid SupplierEvaluationAtPageReqVO pageReqVO) {
PageResult<SupplierEvaluationAtDO> pageResult = supplierEvaluationAtService.getSupplierEvaluationAtPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, SupplierEvaluationAtRespVO.class));
@@ -107,7 +107,7 @@ public class SupplierEvaluationAtController extends AbstractFileUploadController
@GetMapping("/export-excel")
@Operation(summary = "导出供应商评价关系 Excel")
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:export')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation-at:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSupplierEvaluationAtExcel(@Valid SupplierEvaluationAtPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/office/supplier/controller/admin/SupplierPropertiesController.java
View File

@@ -88,7 +88,7 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除供应商属性")
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:delete')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:delete')")
public CommonResult<Boolean> deleteSupplierPropertiesList(@RequestBody BatchDeleteReqVO req) {
supplierPropertiesService.deleteSupplierPropertiesListByIds(req.getIds());
return success(true);
@@ -116,7 +116,7 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
@GetMapping("/export-excel")
@Operation(summary = "导出供应商属性 Excel")
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:export')")
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSupplierPropertiesExcel(@Valid SupplierPropertiesPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
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.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialCorrelationAssayPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialCorrelationAssayRespVO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-correlation-assay")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialCorrelationAssayController implements BusinessControllerMarker {

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONObject;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO;
@@ -46,6 +47,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@RestController
@RequestMapping("/qms/resource/material-infomation")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialInfomationController implements BusinessControllerMarker {

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

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
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.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-inventory-check-detail")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialInventoryCheckDetailController implements BusinessControllerMarker {

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

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
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.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckItemPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckItemRespVO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/material-inventory-check-item")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialInventoryCheckItemController implements BusinessControllerMarker {

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

@@ -9,6 +9,7 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationDO;
import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission;
import com.zt.plat.module.qms.enums.QmsPermissionConstant;
import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceConfigBusinessRuleDO;
import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceProductDO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
@@ -59,7 +60,8 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
.orderByDesc(MaterialInfomationDO::getId));
}
// @QmsPermission(deptIdColumn = "BLG_DEPT_ID")
@QmsPermission(deptIdColumn = "BLG_DEPT_ID",
moduleDataRoleCodes = QmsPermissionConstant.ADMIN_ROLE + "," + QmsPermissionConstant.MATERIAL_ADMIN_ROLE)
default PageResult<MaterialInfomationRespVO> selectPageWithPdtInfo(MaterialInfomationPageReqVO reqVO) {
MPJLambdaWrapper<MaterialInfomationDO> wrapper = new MPJLambdaWrapperX<MaterialInfomationDO>()
.select(MaterialInfomationDO::getId,
@@ -97,9 +99,9 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
.eqIfExists(MaterialProductDO::getParameter, reqVO.getParameter())
.eqIfExists(MaterialInfomationDO::getPublishStatus, reqVO.getPublishStatus())
.eqIfExists(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus())
.eqIfExists(MaterialInfomationDO::getManagerDepartmentId, reqVO.getManagerDepartmentId())
//.eqIfExists(MaterialInfomationDO::getManagerDepartmentId, reqVO.getManagerDepartmentId())
.likeIfExists(MaterialProductDO::getName, reqVO.getName())
.likeIfExists(MaterialInfomationDO::getManagerDepartmentName, reqVO.getManagerDepartmentName())
//.likeIfExists(MaterialInfomationDO::getManagerDepartmentName, reqVO.getManagerDepartmentName())
.eqIfExists(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId())
.likeIfExists(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName())
.eqIfExists(MaterialInfomationDO::getOpenStatus, reqVO.getOpenStatus())
@@ -107,7 +109,7 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
.likeIfExists(MaterialInfomationDO::getOpenUserName, reqVO.getOpenUserName())
.eqIfExists(MaterialInfomationDO::getExpirationFlag, reqVO.getExpirationFlag())
.eqIfExists(MaterialInfomationDO::getUseEndFlag, reqVO.getUseEndFlag())
.eqIfExists(MaterialInfomationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
// .eqIfExists(MaterialInfomationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
.likeIfExists(MaterialInfomationDO::getRemark, reqVO.getRemark())
.orderByDesc(MaterialInfomationDO::getId);
return selectJoinPage(reqVO, MaterialInfomationRespVO.class, wrapper);
@@ -236,6 +238,8 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
return selectJoinList(MaterialInfoWithBizConfigVO.class, wrapper);
}
@QmsPermission(deptIdColumn = "BLG_DEPT_ID",
moduleDataRoleCodes = QmsPermissionConstant.ADMIN_ROLE + "," + QmsPermissionConstant.MATERIAL_ADMIN_ROLE)
default PageResult<MaterialInfomationLedgerRespVO> selectInventoryLedgerPage(MaterialInfomationPageReqVO reqVO) {
MPJLambdaWrapper<MaterialInfomationDO> wrapper = new MPJLambdaWrapperX<MaterialInfomationDO>()
.select(MaterialInfomationDO::getProductId)

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

@@ -5,6 +5,8 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationDO;
import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission;
import com.zt.plat.module.qms.enums.QmsPermissionConstant;
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.dal.dataobject.*;
@@ -37,6 +39,8 @@ public interface MaterialInventoryInboundDetailMapper extends BaseMapperX<Materi
.orderByDesc(MaterialInventoryInboundDetailDO::getId));
}
@QmsPermission(deptIdColumn = "INB_DEPT_ID",
moduleDataRoleCodes = QmsPermissionConstant.ADMIN_ROLE + "," + QmsPermissionConstant.MATERIAL_ADMIN_ROLE)
default PageResult<MaterialInventoryInboundDetailRespVO> selectPageWithMaterialInfo(MaterialInventoryInboundDetailPageReqVO reqVO){
MPJLambdaWrapperX<MaterialInventoryInboundDetailDO> wrapperX = new MPJLambdaWrapperX<MaterialInventoryInboundDetailDO>()
.selectAll(MaterialInventoryInboundDetailDO.class)

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