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

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

@@ -0,0 +1,52 @@
+package com.zt.plat.module.qms.resource.material.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 MaterialLifecycleDetailPageReqVO extends PageParam {
+
+    @Schema(description = "父ID", example = "24095")
+    private Long materialLifecycleId;
+
+    @Schema(description = "物料批次编号", example = "30393")
+    private Long batchId;
+
+    @Schema(description = "物料大类编号", example = "1020")
+    private String categoryProductId;
+
+    @Schema(description = "物料实例编号", example = "11872")
+    private Long infomationId;
+
+    @Schema(description = "影响数量", example = "28166")
+    private String influenceCount;
+
+    @Schema(description = "明细操作类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "处理状态", example = "1")
+    private Integer treatmentStatus;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "公司名称", example = "赵六")
+    private String companyName;
+
+    @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/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java

@@ -0,0 +1,74 @@
+package com.zt.plat.module.qms.resource.material.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 MaterialLifecycleDetailRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "父ID", example = "24095")
+    @ExcelProperty("父ID")
+    private Long materialLifecycleId;
+
+    @Schema(description = "物料批次编号", example = "30393")
+    @ExcelProperty("物料批次编号")
+    private Long batchId;
+
+    @Schema(description = "物料大类编号", example = "1020")
+    @ExcelProperty("物料大类编号")
+    private String categoryProductId;
+
+    @Schema(description = "物料实例编号", example = "11872")
+    @ExcelProperty("物料实例编号")
+    private Long infomationId;
+
+    @Schema(description = "影响数量", example = "28166")
+    @ExcelProperty("影响数量")
+    private String influenceCount;
+
+    @Schema(description = "明细操作类型", example = "2")
+    @ExcelProperty("明细操作类型")
+    private String businessType;
+
+    @Schema(description = "处理状态", example = "1")
+    @ExcelProperty("处理状态")
+    private Integer treatmentStatus;
+
+    @Schema(description = "表单数据,表单数据")
+    @ExcelProperty("表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "公司编号", example = "2613")
+    @ExcelProperty("公司编号")
+    private Long companyId;
+
+    @Schema(description = "公司名称", example = "赵六")
+    @ExcelProperty("公司名称")
+    private String companyName;
+
+    @Schema(description = "部门编号", example = "32413")
+    @ExcelProperty("部门编号")
+    private Long deptId;
+
+    @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/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java

@@ -0,0 +1,49 @@
+package com.zt.plat.module.qms.resource.material.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Schema(description = "管理后台 - 物料通用流程明细,对应生命周期的明细新增/修改 Request VO")
+@Data
+public class MaterialLifecycleDetailSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686")
+    private Long id;
+
+    @Schema(description = "父ID", example = "24095")
+    private Long materialLifecycleId;
+
+    @Schema(description = "物料批次编号", example = "30393")
+    private Long batchId;
+
+    @Schema(description = "物料大类编号", example = "1020")
+    private String categoryProductId;
+
+    @Schema(description = "物料实例编号", example = "11872")
+    private Long infomationId;
+
+    @Schema(description = "影响数量", example = "28166")
+    private String influenceCount;
+
+    @Schema(description = "明细操作类型", example = "2")
+    private String businessType;
+
+    @Schema(description = "处理状态", example = "1")
+    private Integer treatmentStatus;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "公司编号", example = "2613")
+    private Long companyId;
+
+    @Schema(description = "公司名称", example = "赵六")
+    private String companyName;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecyclePageReqVO.java

@@ -0,0 +1,59 @@
+package com.zt.plat.module.qms.resource.material.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 MaterialLifecyclePageReqVO extends PageParam {
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
+    private String businessType;
+
+    @Schema(description = "业务类型编码")
+    private String businessTypeCode;
+
+    @Schema(description = "申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "29846")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "7174")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] applyTime;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "流程实例id", example = "28688")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "2")
+    private String flowStatus;
+
+    @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/resource/material/controller/vo/MaterialLifecycleRespVO.java

@@ -0,0 +1,74 @@
+package com.zt.plat.module.qms.resource.material.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 MaterialLifecycleRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "标题")
+    @ExcelProperty("标题")
+    private String title;
+
+    @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
+    @ExcelProperty("业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请")
+    private String businessType;
+
+    @Schema(description = "业务类型编码")
+    @ExcelProperty("业务类型编码")
+    private String businessTypeCode;
+
+    @Schema(description = "申请人")
+    @ExcelProperty("申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "29846")
+    @ExcelProperty("申请人id")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    @ExcelProperty("申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "7174")
+    @ExcelProperty("申请部门id")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @ExcelProperty("申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "表单数据,表单数据")
+    @ExcelProperty("表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "流程实例id", example = "28688")
+    @ExcelProperty("流程实例id")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "2")
+    @ExcelProperty("流程审批状态")
+    private String flowStatus;
+
+    @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/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java

@@ -0,0 +1,54 @@
+package com.zt.plat.module.qms.resource.material.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 物料通用流程新增/修改 Request VO")
+@Data
+public class MaterialLifecycleSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561")
+    private Long id;
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
+    private String businessType;
+
+    @Schema(description = "业务类型编码")
+    private String businessTypeCode;
+
+    @Schema(description = "申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "29846")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "7174")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "表单数据,表单数据")
+    private String formData;
+
+    @Schema(description = "流程实例id", example = "28688")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "2")
+    private String flowStatus;
+
+    @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/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java

@@ -0,0 +1,82 @@
+package com.zt.plat.module.qms.resource.material.dal.dataobject;
+
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+/**
+* 物料通用流程明细,对应生命周期的明细 DO
+*
+* @author 后台管理
+*/
+@TableName("t_mtrl_lfc_dtl")
+@KeySequence("t_mtrl_lfc_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
+*/
+public class MaterialLifecycleDetailDO extends BusinessBaseDO {
+
+
+
+    /**
+    * 主键
+    */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+    * 父ID
+    */
+    @TableField("MTRL_LFC_ID")
+    private Long materialLifecycleId;
+    /**
+    * 物料批次编号
+    */
+    @TableField("BAT_ID")
+    private Long batchId;
+    /**
+    * 物料大类编号
+    */
+    @TableField("CTGR_PDT_ID")
+    private String categoryProductId;
+    /**
+    * 物料实例编号
+    */
+    @TableField("INF_ID")
+    private Long infomationId;
+    /**
+    * 影响数量
+    */
+    @TableField("INFL_CNT")
+    private String influenceCount;
+    /**
+    * 明细操作类型
+    */
+    @TableField("BSN_TP")
+    private String businessType;
+    /**
+    * 处理状态
+    */
+    @TableField("TMT_STS")
+    private Integer treatmentStatus;
+    /**
+    * 表单数据,表单数据
+    */
+    @TableField("FORM_DAT")
+    private String formData;
+    /**
+    * 所属部门
+    */
+    @TableField("SYS_DEPT_CD")
+    private String systemDepartmentCode;
+    /**
+    * 备注
+    */
+    @TableField("RMK")
+    private String remark;
+
+}