班组商检报告

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -206,6 +206,14 @@ public interface QmsCommonConstant {
     /** 数据回报状态 未回报 **/
     String UNRETURNED = "unreturned";
     
+    /** 委检登记附件类型：委检登记上传 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_REGISTRATION = "entrust_registration_upload";
+
+    /** 委检登记附件类型：原始记录 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_ASSAY_TASK = "entrust_assay_task_upload";
+    
+    /** 委检登记附件类型：商检部门分析报告 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_DEPT_DOC = "entrust_dept_doc_upload";
     
     /** 自动 **/
     String AUTOMATIC = "automatic";

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleDeptEntrustDocAuditController.java

@@ -0,0 +1,45 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+import com.zt.plat.module.qms.business.bus.controller.vo.DeptEntrustDocAuditParam;
+import com.zt.plat.module.qms.business.bus.service.SampleDeptEntrustDocAuditService;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+
+@Tag(name = "管理后台 - 样品班组委托报告审核")
+@RestController
+@RequestMapping("/qms/bus/sample/dept-entrust-doc-audit")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleDeptEntrustDocAuditController {
+	
+	@Resource
+	private SampleDeptEntrustDocAuditService sampleDeptEntrustDocAuditService;
+	
+	
+	@GetMapping("/getDeptEntrustDocAuditByBusSampleEntrustDeptId")
+	public CommonResult<?> getDeptEntrustDocAuditByBusSampleEntrustDeptId(Long businessSampleEntrustDepartmentId) {
+		JSONObject json = sampleDeptEntrustDocAuditService.getDeptEntrustDocAuditByBusSampleEntrustDeptId(businessSampleEntrustDepartmentId);
+		return success(json);
+	}
+	
+	@PostMapping("/auditDeptEntrustDocAudit")
+	public CommonResult<?> auditDeptEntrustDocAudit(@RequestBody DeptEntrustDocAuditParam param) {
+		sampleDeptEntrustDocAuditService.auditDeptEntrustDocAudit(param);
+		return success("成功");
+	}
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataExtendRespVO.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayReportDataExtendRespVO extends BusinessAssayReportDataRespVO {
+
+
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("样品大类名称")
+    private String baseSampleName;
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustDepartmentDetailPageReqVO.java

@@ -0,0 +1,66 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+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 BusinessSampleEntrustDepartmentDetailPageReqVO extends PageParam {
+
+    @Schema(description = "检验委托登记ID", example = "24581")
+    private Long businessSampleEntrustRegistrationId;
+
+    @Schema(description = "委检登记分析部门业务ID", example = "14151")
+    private Long businessSampleEntrustDepartmentId;
+
+    @Schema(description = "主样业务ID", example = "11395")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品大类ID", example = "24368")
+    private Long baseSampleId;
+
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", example = "30799")
+    private Long sampleTypeDictionaryBusinessId;
+
+    @Schema(description = "样品名称", example = "张三")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "委托样品名称", example = "王五")
+    private String entrustSampleName;
+
+    @Schema(description = "委托样品编号")
+    private String entrustSampleCode;
+
+    @Schema(description = "检测项目")
+    private String assayProject;
+
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
+    private String assayStatus;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "乐观锁", example = "25815")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustDepartmentDetailRespVO.java

@@ -0,0 +1,86 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
+
+@Schema(description = "管理后台 - 委检登记分析部门样品明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessSampleEntrustDepartmentDetailRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "304")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24581")
+    @ExcelProperty("检验委托登记ID")
+    private Long businessSampleEntrustRegistrationId;
+
+    @Schema(description = "委检登记分析部门业务ID", example = "14151")
+    @ExcelProperty("委检登记分析部门业务ID")
+    private Long businessSampleEntrustDepartmentId;
+
+    @Schema(description = "主样业务ID", example = "11395")
+    @ExcelProperty("主样业务ID")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24368")
+    @ExcelProperty("样品大类ID")
+    private Long baseSampleId;
+
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "30799")
+    @ExcelProperty("样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等")
+    private Long sampleTypeDictionaryBusinessId;
+
+    @Schema(description = "样品名称", example = "张三")
+    @ExcelProperty("样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    @ExcelProperty("样品编号")
+    private String sampleCode;
+
+    @Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @ExcelProperty("委托样品名称")
+    private String entrustSampleName;
+
+    @Schema(description = "委托样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("委托样品编号")
+    private String entrustSampleCode;
+
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("检测项目")
+    private String assayProject;
+
+    @Dict(dicCode = "entrust_assay_status")
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
+    @ExcelProperty("检验状态,unchecked-未检验；checked-已检验")
+    private String assayStatus;
+
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("排序")
+    private Integer sort;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25815")
+    @ExcelProperty("乐观锁")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustDepartmentDetailSaveReqVO.java

@@ -0,0 +1,68 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 委检登记分析部门样品明细新增/修改 Request VO")
+@Data
+public class BusinessSampleEntrustDepartmentDetailSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "304")
+    private Long id;
+
+    @Schema(description = "检验委托登记ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24581")
+    @NotNull(message = "检验委托登记ID不能为空")
+    private Long businessSampleEntrustRegistrationId;
+
+    @Schema(description = "委检登记分析部门业务ID", example = "14151")
+    private Long businessSampleEntrustDepartmentId;
+
+    @Schema(description = "主样业务ID", example = "11395")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品大类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24368")
+    @NotNull(message = "样品大类ID不能为空")
+    private Long baseSampleId;
+
+    @Schema(description = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等", requiredMode = Schema.RequiredMode.REQUIRED, example = "30799")
+    @NotNull(message = "样品类型ID,字典表：【T_DIC_SMP_TP】西南铜委托样、商检委托样、内部委托样、抽查委托样、内审委托样等不能为空")
+    private Long sampleTypeDictionaryBusinessId;
+
+    @Schema(description = "样品名称", example = "张三")
+    private String sampleName;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @NotEmpty(message = "委托样品名称不能为空")
+    private String entrustSampleName;
+
+    @Schema(description = "委托样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "委托样品编号不能为空")
+    private String entrustSampleCode;
+
+    @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "检测项目不能为空")
+    private String assayProject;
+
+    @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2")
+    private String assayStatus;
+
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25815")
+    @NotNull(message = "乐观锁不能为空")
+    private Integer updateCount;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustDepartmentExtendRespVO.java

@@ -0,0 +1,24 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSampleEntrustDepartmentExtendRespVO extends BusinessSampleEntrustDepartmentRespVO {
+
+    @Schema(description = "委托ID", example = "8978")
+    private Long entrustId;
+
+    @Schema(description = "委托单号")
+    private String entrustNumber;
+
+    @Schema(description = "委托单位/送样单位")
+    private String entrustUnit;
+
+    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托", example = "6609")
+    private Long configEntrustSourceId;
+    
+    @Schema(description = "委托来源,西南铜委托、商检委托、内部委托、抽查委托、内审委托、生产委托")
+    private String configEntrustSourceName;
+
+}