fix:物料清洗回收，使用记录监督人确认

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseEndReuseController.java

@@ -111,4 +111,11 @@ public class MaterialUseEndReuseController extends AbstractFileUploadController
                         BeanUtils.toBean(list, MaterialUseEndReuseRespVO.class));
     }
 
+    @PutMapping("/reuse")
+    @Operation(summary = "物料回收")
+    public CommonResult<Boolean> reuseMaterial(@RequestBody List<Long> detailIds) {
+        materialUseEndReuseService.reuseMaterialsByDetailIds(detailIds);
+        return success(true);
+    }
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseRecordController.java

@@ -55,7 +55,7 @@ public class MaterialUseRecordController implements BusinessControllerMarker {
         return success(materialUseRecordDetailService.makeHazardousMaterial(makeReqVO));
     }
 
-    @PutMapping("/update")
+//    @PutMapping("/update")
     @Operation(summary = "更新使用记录")
     @PreAuthorize("@ss.hasPermission('qms:material-use-record:update')")
     public CommonResult<Boolean> updateMaterialUseRecord(@Valid @RequestBody MaterialUseRecordSaveReqVO updateReqVO) {
@@ -111,4 +111,11 @@ public class MaterialUseRecordController implements BusinessControllerMarker {
                         BeanUtils.toBean(list, MaterialUseRecordRespVO.class));
     }
 
+
+    @PutMapping("/review")
+    @Operation(summary = "监督确认")
+    public CommonResult<Boolean> superviseReviews(@RequestBody List<Long> ids) {
+        return success(materialUseRecordService.superviseReviews(ids));
+    }
+
 }

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

@@ -1,10 +1,12 @@
 package com.zt.plat.module.qms.resource.material.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -35,6 +37,18 @@ public class MaterialUseEndReuseDetailPageReqVO extends PageParam {
     @Schema(description = "物料id", example = "7953")
     private Long infomationId;
 
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    @Schema(description = "物料类型：玻璃，塑料")
+    private String materialType;
+
+    @Schema(description = "回收日期")
+    private LocalDateTime ruseDate;
+
+    @Schema(description = "处理回收状态,0-未回收，1-已回收")
+    private String treatmentStatus;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

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

@@ -53,6 +53,14 @@ public class MaterialUseEndReuseDetailRespVO {
     @ExcelProperty("型号")
     private String modelNo;
 
+    @Schema(description = "大类id", example = "108")
+    @ExcelProperty("大类id")
+    private Long productId;
+
+    @Schema(description = "物料名称")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
     @Schema(description = "数量")
     @ExcelProperty("数量")
     private BigDecimal quantity;
@@ -61,6 +69,22 @@ public class MaterialUseEndReuseDetailRespVO {
     @ExcelProperty("物料类型：玻璃，塑料")
     private String materialType;
 
+    @Schema(description = "回收人")
+    @ExcelProperty("回收人")
+    private String reuseName;
+
+    @Schema(description = "回收人id")
+    @ExcelProperty("回收人id")
+    private String reuseId;
+
+    @Schema(description = "回收日期")
+    @ExcelProperty("回收日期")
+    private LocalDateTime reuseDate;
+
+    @Schema(description = "处理回收状态,0-未回收，1-已回收")
+    @ExcelProperty("处理回收状态,0-未回收，1-已回收")
+    private String treatmentStatus;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

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

@@ -19,6 +19,12 @@ public class MaterialUseEndReuseDetailSaveReqVO {
     @Schema(description = "物料id", example = "7953")
     private Long infomationId;
 
+    @Schema(description = "大类id", example = "108")
+    private Long productId;
+
+    @Schema(description = "物料名称")
+    private String materialName;
+
     @Schema(description = "数量")
     private BigDecimal quantity;
 

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

@@ -29,10 +29,19 @@ public class MaterialUseEndReuseRespVO {
     @ExcelProperty("操作人id")
     private Long operatorId;
 
-    @Schema(description = "标记日期或清洗回收日期")
+    @Schema(description = "标记日期或清洗日期")
-    @ExcelProperty("标记日期或清洗回收日期")
+    @ExcelProperty("标记日期或清洗日期")
     private LocalDateTime operatorDate;
 
+    @Schema(description = "回收人")
+    private String reuseName;
+
+    @Schema(description = "回收人id")
+    private Long reuseId;
+
+    @Schema(description = "回收日期")
+    private LocalDateTime reuseDate;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.material.controller.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -28,6 +29,15 @@ public class MaterialUseEndReuseSaveReqVO {
     @Schema(description = "标记日期或清洗回收日期")
     private LocalDateTime operatorDate;
 
+    @Schema(description = "回收人")
+    private String reuseName;
+
+    @Schema(description = "回收人id")
+    private Long reuseId;
+
+    @Schema(description = "回收日期")
+    private LocalDateTime reuseDate;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

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

@@ -50,6 +50,9 @@ public class MaterialUseRecordPageReqVO extends PageParam {
     @Schema(description = "监督人姓名", example = "李四")
     private String supervisorName;
 
+    @Schema(description = "审核确认状态,0-未确认，1-已确认")
+    private String reviewStatus;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialUseRecordRespVO.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.baomidou.mybatisplus.annotation.TableField;
 import com.zt.plat.module.qms.core.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -74,6 +75,12 @@ public class MaterialUseRecordRespVO {
     @ExcelProperty("监督人姓名")
     private String supervisorName;
 
+    @Schema(description = "确认处理状态")
+    private String reviewStatus;
+
+    @Schema(description = "确认处理日期")
+    private LocalDateTime reviewDate;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialUseEndReuseDO.java

@@ -50,6 +50,21 @@ public class MaterialUseEndReuseDO extends BusinessBaseDO {
     */
     @TableField("OPTR_DT")
     private LocalDateTime operatorDate;
+    /**
+     * 回收人
+     */
+    @TableField("RUSE_NAME")
+    private String reuseName;
+    /**
+     * 回收人id
+     */
+    @TableField("RUSE_ID")
+    private Long reuseId;
+    /**
+     * 回收日期
+     */
+    @TableField("RUSE_DT")
+    private LocalDateTime reuseDate;
     /**
     * 所属部门
     */