Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

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

@@ -80,7 +80,9 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_QC_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样与检测方法配置不存在");
 	ErrorCode CONFIG_QC_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控与定值样关系不存在");
 	ErrorCode CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样检测方法参数配置不存在");
-	
+	ErrorCode CONFIG_PERMISSION_NOT_EXISTS = new ErrorCode(1_032_050_000, "权限配置不存在");
+	ErrorCode CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "存放位置不存在");
+
 	/*=================================bus 检验业务  1_032_100_000 ~ 1_032_149_999==================================*/
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品明细不存在");
@@ -120,14 +122,17 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
 	ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
-	
+
-	
+
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
 	ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
 	ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
 	ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
 
+	ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
+	ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
+
 	/*=================================resource  资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
 	ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");
 	ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备大类不存在");

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

@@ -0,0 +1,85 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+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 BusinessSampleDispatchDetailPageReqVO extends PageParam {
+
+    @Schema(description = "主表数据id,支持", example = "10889")
+    private Long parentId;
+
+    @Schema(description = "业务数据ID", example = "10723")
+    private Long businessSubSampleId;
+
+    @Schema(description = "领用人")
+    private String borrowUser;
+
+    @Schema(description = "领用人id", example = "11884")
+    private Long borrowUserId;
+
+    @Schema(description = "领用时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Long[] borrowTime;
+
+    @Schema(description = "归还人")
+    private String givebackUser;
+
+    @Schema(description = "归还人id", example = "30812")
+    private Long givebackUserId;
+
+    @Schema(description = "归还时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Long[] givebackTime;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "10703")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] applyTime;
+
+    @Schema(description = "提交状态,0-未提交；1-已提交", example = "2")
+    private String submitStatus;
+
+    @Schema(description = "审批状态,0-未审批；1-已审批", example = "2")
+    private String approvalStatus;
+
+    @Schema(description = "使用状态", example = "2")
+    private String useStatus;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "表单模板,表单编辑器模板")
+    private String formTemplate;
+
+    @Schema(description = "流程实例id", example = "25078")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    private String flowStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

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

@@ -0,0 +1,80 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import jakarta.validation.constraints.*;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 样品调拨明细新增/修改 Request VO")
+@Data
+public class BusinessSampleDispatchDetailSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31752")
+    private Long id;
+
+    @Schema(description = "主表数据id,支持", requiredMode = Schema.RequiredMode.REQUIRED, example = "10889")
+    @NotNull(message = "主表数据id,支持不能为空")
+    private Long parentId;
+
+    @Schema(description = "业务数据ID", example = "10723")
+    private Long businessSubSampleId;
+
+    @Schema(description = "领用人")
+    private String borrowUser;
+
+    @Schema(description = "领用人id", example = "11884")
+    private Long borrowUserId;
+
+    @Schema(description = "领用时间")
+    private Long borrowTime;
+
+    @Schema(description = "归还人")
+    private String givebackUser;
+
+    @Schema(description = "归还人id", example = "30812")
+    private Long givebackUserId;
+
+    @Schema(description = "归还时间")
+    private Long givebackTime;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "10703")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "提交状态,0-未提交；1-已提交", example = "2")
+    private String submitStatus;
+
+    @Schema(description = "审批状态,0-未审批；1-已审批", example = "2")
+    private String approvalStatus;
+
+    @Schema(description = "使用状态", example = "2")
+    private String useStatus;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "表单模板,表单编辑器模板")
+    private String formTemplate;
+
+    @Schema(description = "流程实例id", example = "25078")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    private String flowStatus;
+
+    @Schema(description = "审批意见")
+    private String opinion;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,68 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+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 BusinessSampleDispatchPageReqVO extends PageParam {
+
+    @Schema(description = "主管部门id", example = "14119")
+    private Long mainDepartmentId;
+
+    @Schema(description = "主管部门名称", example = "王五")
+    private String mainDepartmentName;
+
+    @Schema(description = "申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "20497")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "28216")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] applyTime;
+
+    @Schema(description = "库管员")
+    private String warehouseUser;
+
+    @Schema(description = "库管员ID", example = "15295")
+    private Long warehouseUserId;
+
+    @Schema(description = "提交状态，用于无申请调拨,0-未提交；1-已提交", example = "2")
+    private String submitStatus;
+
+    @Schema(description = "流程实例id", example = "25006")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    private String flowStatus;
+
+    @Schema(description = "完成状态", example = "1")
+    private String finishStatus;
+
+    @Schema(description = "取消状态", example = "1")
+    private String cancelStatus;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.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.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 样品调拨 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BusinessSampleDispatchRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24883")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "主管部门id", example = "14119")
+    @ExcelProperty("主管部门id")
+    private Long mainDepartmentId;
+
+    @Schema(description = "主管部门名称", example = "王五")
+    @ExcelProperty("主管部门名称")
+    private String mainDepartmentName;
+
+    @Schema(description = "申请人")
+    @ExcelProperty("申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "20497")
+    @ExcelProperty("申请人id")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    @ExcelProperty("申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "28216")
+    @ExcelProperty("申请部门id")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @ExcelProperty("申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "库管员")
+    @ExcelProperty("库管员")
+    private String warehouseUser;
+
+    @Schema(description = "库管员ID", example = "15295")
+    @ExcelProperty("库管员ID")
+    private Long warehouseUserId;
+
+    @Schema(description = "提交状态，用于无申请调拨,0-未提交；1-已提交", example = "2")
+    @ExcelProperty("提交状态，用于无申请调拨,0-未提交；1-已提交")
+    private String submitStatus;
+
+    @Schema(description = "流程实例id", example = "25006")
+    @ExcelProperty("流程实例id")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    @ExcelProperty("流程审批状态")
+    private String flowStatus;
+
+    @Schema(description = "完成状态", example = "1")
+    @ExcelProperty("完成状态")
+    private String finishStatus;
+
+    @Schema(description = "取消状态", example = "1")
+    @ExcelProperty("取消状态")
+    private String cancelStatus;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,63 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 样品调拨新增/修改 Request VO")
+@Data
+public class BusinessSampleDispatchSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24883")
+    private Long id;
+
+    @Schema(description = "主管部门id", example = "14119")
+    private Long mainDepartmentId;
+
+    @Schema(description = "主管部门名称", example = "王五")
+    private String mainDepartmentName;
+
+    @Schema(description = "申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "20497")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "28216")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "库管员")
+    private String warehouseUser;
+
+    @Schema(description = "库管员ID", example = "15295")
+    private Long warehouseUserId;
+
+    @Schema(description = "提交状态，用于无申请调拨,0-未提交；1-已提交", example = "2")
+    private String submitStatus;
+
+    @Schema(description = "流程实例id", example = "25006")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    private String flowStatus;
+
+    @Schema(description = "完成状态", example = "1")
+    private String finishStatus;
+
+    @Schema(description = "取消状态", example = "1")
+    private String cancelStatus;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}