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

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java

@@ -247,6 +247,9 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
             JSONObject json = JSONObject.parseObject(content);
             for(String key : json.keySet()){
                 JSONObject obj = json.getJSONObject(key);
+                if ("ingredient".equals(obj.get("usage"))) {//如果是配料的，则不拼接
+					continue;
+				}
                 String methodName = obj.getString("methodName");
                 if(ObjectUtils.isEmpty(methodName))
                     continue;

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

@@ -0,0 +1,38 @@
+package com.zt.plat.module.qms.resource.material.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 使用记录新增/修改 Request VO")
+@Data
+public class MaterialHazardousMakeSaveReqVO {
+
+    @Schema(description = "使用记录ids")
+    @NotNull
+    private List<Long> recordIds;
+
+    @Schema(description = "配置的大类")
+    @NotNull
+    private Long productId;
+
+    @Schema(description = "说明")
+    private String reason;
+
+    @Schema(description = "监督人id", example = "13958")
+    private Long supervisorId;
+
+    @Schema(description = "监督人姓名", example = "李四")
+    private String supervisorName;
+
+    @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/controller/vo/MaterialLifecycleRespVO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -84,4 +85,7 @@ public class MaterialLifecycleRespVO {
     @ExcelProperty("流程明细")
     private List<MaterialLifecycleDetailRespVO> detailList;
 
+    @Schema(description = "附件对象")
+    private List<BusinessFileWithUrlRespDTO> businessFileRet;
+
 }

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

@@ -2,8 +2,6 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileWithUrlRespDTO;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -78,6 +76,10 @@ public class MaterialProductRespVO {
     @ExcelProperty("技术参数")
     private String parameter;
 
+    @Schema(description = "额定容量")
+    @ExcelProperty("技术参数")
+    private BigDecimal standardCapacity;
+
     @Schema(description = "制造商")
     @ExcelProperty("制造商")
     private String manufacturer;
@@ -133,22 +135,23 @@ public class MaterialProductRespVO {
 
     @Schema(description = "是否检化验,1-是，0-否")
     @ExcelProperty("是否检化验,1-是，0-否")
+    @Dict(dicCode = "yes_or_no")
     private Integer assayFlag;
 
     @Schema(description = "是否进行库存预警,1-是，0-否")
     @ExcelProperty("是否进行库存预警,1-是，0-否")
     @Dict(dicCode = "yes_or_no")
-    private Integer InventoryAlarmFlag;
+    private Integer inventoryAlarmFlag;
 
 
     @Schema(description = "库存预警级别,safe-安全，warn-警告，danger")
     @ExcelProperty("库存预警级别,safe-安全，warn-警告，danger")
     @Dict(dicCode = "alarm_level")
-    private String InventoryAlarmLevel;
+    private String inventoryAlarmLevel;
 
     @Schema(description = "库存预警区间,json格式配置")
     @ExcelProperty("库存预警区间,json格式配置")
-    private String InventoryAlarmRange;
+    private String inventoryAlarmRange;
 
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")

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

@@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Schema(description = "管理后台 - 物料大类新增/修改 Request VO")
@@ -53,6 +54,9 @@ public class MaterialProductSaveReqVO {
     @Schema(description = "技术参数")
     private String parameter;
 
+    @Schema(description = "额定容量")
+    private BigDecimal standardCapacity;
+
     @Schema(description = "制造商")
     private String manufacturer;
 

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

@@ -0,0 +1,35 @@
+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 MaterialUseRecordDetailPageReqVO extends PageParam {
+
+    @Schema(description = "物料实例id", example = "26970")
+    private Long infomationId;
+
+    @Schema(description = "源使用记录id", example = "2761")
+    private Long recordId;
+
+    @Schema(description = "配置生成的物料实例id", example = "29658")
+    private Long targetInfomationId;
+
+    @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/MaterialUseRecordDetailRespVO.java

@@ -0,0 +1,43 @@
+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 MaterialUseRecordDetailRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11654")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "物料实例id", example = "26970")
+    @ExcelProperty("物料实例id")
+    private Long infomationId;
+
+    @Schema(description = "源使用记录id", example = "2761")
+    @ExcelProperty("源使用记录id")
+    private Long recordId;
+
+    @Schema(description = "配置生成的物料实例id", example = "29658")
+    @ExcelProperty("配置生成的物料实例id")
+    private Long targetInfomationId;
+
+    @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/MaterialUseRecordDetailSaveReqVO.java

@@ -0,0 +1,28 @@
+package com.zt.plat.module.qms.resource.material.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 使用记录配置关系,用于处理危险品溶液配置关系新增/修改 Request VO")
+@Data
+public class MaterialUseRecordDetailSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11654")
+    private Long id;
+
+    @Schema(description = "物料实例id", example = "26970")
+    private Long infomationId;
+
+    @Schema(description = "源使用记录id", example = "2761")
+    private Long recordId;
+
+    @Schema(description = "配置生成的物料实例id", example = "29658")
+    private Long targetInfomationId;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}