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

feat:溶液配置

Browse Source
This commit is contained in:
shusir
2026-02-10 18:07:10 +08:00
parent b315bec634
commit f13e72d8d0
26 changed files with 989 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
View File

@@ -200,6 +200,8 @@ public interface ErrorCodeConstants {
ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
ErrorCode MATERIAL_STANDARD_SOLUTION_NOT_EXISTS = new ErrorCode(1_032_160_000, "标准溶液不存在");

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

@@ -39,14 +39,14 @@ public class MaterialLifecycleDetailController implements BusinessControllerMark
@Resource
private MaterialLifecycleDetailService materialLifecycleDetailService;
@PostMapping("/create")
// @PostMapping("/create")
@Operation(summary = "创建物料通用流程明细")
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:create')")
public CommonResult<MaterialLifecycleDetailRespVO> createMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO createReqVO) {
return success(materialLifecycleDetailService.createMaterialLifecycleDetail(createReqVO));
}
@PutMapping("/update")
// @PutMapping("/update")
@Operation(summary = "更新物料通用流程明细")
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:update')")
public CommonResult<Boolean> updateMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO updateReqVO) {
@@ -54,7 +54,7 @@ public class MaterialLifecycleDetailController implements BusinessControllerMark
return success(true);
}
@DeleteMapping("/delete")
// @DeleteMapping("/delete")
@Operation(summary = "删除物料通用流程明细")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:delete')")
@@ -63,7 +63,7 @@ public class MaterialLifecycleDetailController implements BusinessControllerMark
return success(true);
}
@DeleteMapping("/delete-list")
// @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除物料通用流程明细")
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:delete')")
@@ -83,12 +83,20 @@ public class MaterialLifecycleDetailController implements BusinessControllerMark
@GetMapping("/page")
@Operation(summary = "获得物料通用流程明细分页")
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:query')")
// @PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:query')")
public CommonResult<PageResult<MaterialLifecycleDetailRespVO>> getMaterialLifecycleDetailPage(@Valid MaterialLifecycleDetailPageReqVO pageReqVO) {
PageResult<MaterialLifecycleDetailDO> pageResult = materialLifecycleDetailService.getMaterialLifecycleDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialLifecycleDetailRespVO.class));
}
@GetMapping("/list")
@Operation(summary = "获取未配置的溶液配置申请")
// @PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:query')")
public CommonResult<List<MaterialLifecycleDetailRespVO>> getNotMakeLifecycleDetailList(@Valid MaterialLifecycleDetailPageReqVO reqVO) {
List<MaterialLifecycleDetailRespVO> detailList = materialLifecycleDetailService.getNotMakeLifecycleDetailList(reqVO);
return success(detailList);
}
@GetMapping("/export-excel")
@Operation(summary = "导出物料通用流程明细 Excel")
@PreAuthorize("@ss.hasPermission('t:material-lifecycle-detail:export')")

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

@@ -14,6 +14,7 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.query.MaterialProductQueryVO;
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO;
import com.zt.plat.module.qms.resource.material.service.MaterialProductService;
import io.swagger.v3.oas.annotations.Operation;
@@ -89,19 +90,18 @@ public class MaterialProductController extends AbstractFileUploadController impl
@GetMapping("category-data")
@Operation(summary = "获得物料分类和大类")
@Parameter(name = "type", description = "category-分类，data-全部")
public CommonResult<List<MaterialProductRespVO>> getCategoryAndData(@RequestParam("type") String type) {
return success(materialProductService.getCategoryAndData(type));
public CommonResult<List<MaterialProductRespVO>> getCategoryAndData(@Valid MaterialProductQueryVO queryVO) {
return success(materialProductService.getCategoryAndData(queryVO));
}
// @PutMapping("/update")
// @Operation(summary = "更新物料")
// @PreAuthorize("@ss.hasPermission('qms:material-product:update')")
// public CommonResult<Boolean> updateMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO updateReqVO) {
// materialProductService.updateMaterialProduct(updateReqVO);
// return success(true);
// }
@Operation(summary = "更新物料")
@PreAuthorize("@ss.hasPermission('qms:material-product:update')")
public CommonResult<Boolean> updateMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO updateReqVO) {
materialProductService.updateMaterialProduct(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除物料分类或大类")

114
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialStandardSolutionController.java Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -108,6 +108,42 @@ public class MaterialInfomationRespVO {
@ExcelProperty("负责人")
private String managerUserName;
@Schema(description = "是否危险品,1-是，0-否")
@ExcelProperty("是否危险品,1-是，0-否")
private Integer hazardous;
@Schema(description = "是否标准溶液,1-是，0-否")
@ExcelProperty("是否标准溶液,1-是，0-否")
private Integer standardSolutionFlag;
@Schema(description = "是否标准物质,1-是，0-否")
@ExcelProperty("是否标准物质,1-是，0-否")
private Integer standardMaterialFlag;
@Schema(description = "配置人")
@ExcelProperty("配置人")
private String makeUser;
@Schema(description = "配置人id", example = "5428")
@ExcelProperty("配置人id")
private Long makeUserId;
@Schema(description = "配置日期")
@ExcelProperty("配置日期")
private LocalDateTime makeDate;
@Schema(description = "到期日期")
@ExcelProperty("到期日期")
private LocalDateTime dueDate;
@Schema(description = "浓度")
@ExcelProperty("浓度")
private String concentration;
@Schema(description = "滴定度")
@ExcelProperty("滴定度")
private String titer;
@Schema(description = "开封状态,0-未开封，1-已开封", example = "2")
@ExcelProperty("开封状态,0-未开封，1-已开封")
private Integer openStatus;

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

@@ -14,10 +14,10 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
public class MaterialLifecycleDetailPageReqVO extends PageParam {
@Schema(description = "父id", example = "6294")
private Long materialLifecycleId;
private Long lifecycleId;
@Schema(description = "物料大类id", example = "31283")
private String categoryProductId;
private String productId;
@Schema(description = "物料批次id", example = "12948")
private Long batchId;

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

@@ -34,6 +34,10 @@ public class MaterialLifecycleDetailRespVO {
@ExcelProperty("物料大类编码")
private String productCode;
@Schema(description = "单位")
@ExcelProperty("单位")
private String unit;
@Schema(description = "物料大类型号")
@ExcelProperty("物料大类型号")
private String productModelNo;
@@ -54,6 +58,26 @@ public class MaterialLifecycleDetailRespVO {
@ExcelProperty("批次工段-部门名称")
private String assignDepartmentName;
@Schema(description = "申请人")
@ExcelProperty("申请人")
private String applyUser;
@Schema(description = "申请人id", example = "4976")
@ExcelProperty("申请人id")
private Long applyUserId;
@Schema(description = "申请部门")
@ExcelProperty("申请部门")
private String applyDepartment;
@Schema(description = "申请部门id", example = "19765")
@ExcelProperty("申请部门id")
private Long applyDepartmentId;
@Schema(description = "申请时间")
@ExcelProperty("申请时间")
private LocalDateTime applyTime;
@Schema(description = "是否检化验,1-是，0-否")
@ExcelProperty("是否检化验,1-是，0-否")
private Integer assayFlag;

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

@@ -60,6 +60,7 @@ public class MaterialLifecycleRespVO {
@Schema(description = "提交状态,提交状态,0-未提交，1-已提交", example = "1")
@ExcelProperty("提交状态,提交状态,0-未提交，1-已提交")
@Dict(dicCode = "submit_status")
private Integer submitStatus;
@Schema(description = "流程审批状态", example = "1")

73
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialStandardSolutionPageReqVO.java Normal file
View File

@@ -0,0 +1,73 @@
package com.zt.plat.module.qms.resource.material.controller.vo;
import com.zt.plat.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 标液,标准溶液，包含配置信息分页 Request VO")
@Data
public class MaterialStandardSolutionPageReqVO extends PageParam {
@Schema(description = "分类或大类id", example = "438")
private Long productId;
@Schema(description = "配置申请明细ID", example = "438")
private Long detailId;
@Schema(description = "物料实例id", example = "14530")
private Long infomationId;
@Schema(description = "配置人")
private String makeUser;
@Schema(description = "配置人id", example = "5428")
private Long makeUserId;
@Schema(description = "配置日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] makeDate;
@Schema(description = "总体积")
private String volumeTotal;
@Schema(description = "配置记录")
private String makeRecord;
@Schema(description = "有效期")
private Integer due;
@Schema(description = "到期日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] dueDate;
@Schema(description = "滴定管编号")
private String buretteNo;
@Schema(description = "浓度")
private String concentration;
@Schema(description = "滴定度")
private String titer;
@Schema(description = "标定流程类型", example = "2")
private Long standardFlowType;
@Schema(description = "标定状态")
private String standardFlow;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")
private String remark;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

95
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialStandardSolutionRespVO.java Normal file
View File

@@ -0,0 +1,95 @@
package com.zt.plat.module.qms.resource.material.controller.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 标液,标准溶液，包含配置信息 Response VO")
@Data
@ExcelIgnoreUnannotated
public class MaterialStandardSolutionRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "19766")
@ExcelProperty("主键")
private Long id;
@Schema(description = "配置申请明细ID", example = "438")
@ExcelProperty("配置申请明细ID")
private Long detailId;
@Schema(description = "物料实例id", example = "14530")
@ExcelProperty("物料实例id")
private Long infomationId;
@Schema(description = "物料名称")
@ExcelProperty("物料名称")
private String infomationName;
@Schema(description = "物料编号")
@ExcelProperty("物料编号")
private String infomationCode;
@Schema(description = "配置人")
@ExcelProperty("配置人")
private String makeUser;
@Schema(description = "配置人id", example = "5428")
@ExcelProperty("配置人id")
private Long makeUserId;
@Schema(description = "配置日期")
@ExcelProperty("配置日期")
private LocalDateTime makeDate;
@Schema(description = "总体积")
@ExcelProperty("总体积")
private String volumeTotal;
@Schema(description = "配置记录")
@ExcelProperty("配置记录")
private String makeRecord;
@Schema(description = "有效期")
@ExcelProperty("有效期")
private Integer due;
@Schema(description = "到期日期")
@ExcelProperty("到期日期")
private LocalDateTime dueDate;
@Schema(description = "滴定管编号")
@ExcelProperty("滴定管编号")
private String buretteNo;
@Schema(description = "浓度")
@ExcelProperty("浓度")
private String concentration;
@Schema(description = "滴定度")
@ExcelProperty("滴定度")
private String titer;
@Schema(description = "标定流程类型", example = "2")
@ExcelProperty("标定流程类型")
private Long standardFlowType;
@Schema(description = "标定状态")
@ExcelProperty("标定状态")
private String standardFlow;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

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