feat:物料用完标记和清洗回收

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

@@ -187,14 +187,11 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_BATCH_ASSIGN_END = new ErrorCode(1_032_160_000, "物料批次已拆分，不可操作");
 	ErrorCode GONGDUAN_BELONG_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段所属的物料批次不一致");
 	ErrorCode GONGDUAN_QUANTITY_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段累加数量和批次数量不一致");
-	ErrorCode MATERIAL_BATCH_NOT_ASSIGN_FOR_SUBMIT = new ErrorCode(1_032_160_000, "物料批次未拆分，不可提交");
-	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次分发不存在");
 	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库，出库不存在");
 	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库明细,出库明细等不存在");
 
 	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
 
-	ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "存放位置不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
@@ -204,6 +201,8 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_STANDARD_SOLUTION_NOT_EXISTS = new ErrorCode(1_032_160_000, "标准溶液不存在");
 	ErrorCode MATERIAL_USE_RECORD_NOT_EXISTS = new ErrorCode(1_032_160_000, "使用记录不存在");
 	ErrorCode MATERIAL_USE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "使用配置明细不存在");
+	ErrorCode MATERIAL_USE_END_REUSE_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料用完标记或清洗回收不存在");
+	ErrorCode MATERIAL_USE_END_REUSE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料用完标记或清洗回收明细不存在");
 
 
 

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

@@ -10,6 +10,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.module.qms.resource.material.controller.vo.*;
 import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialUseRecordDO;
+import com.zt.plat.module.qms.resource.material.service.MaterialUseRecordDetailService;
 import com.zt.plat.module.qms.resource.material.service.MaterialUseRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -17,6 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +38,8 @@ public class MaterialUseRecordController implements BusinessControllerMarker {
 
     @Resource
     private MaterialUseRecordService materialUseRecordService;
+    @Autowired
+    private MaterialUseRecordDetailService materialUseRecordDetailService;
 
     @PostMapping("/add")
     @Operation(summary = "新增使用记录")
@@ -48,7 +52,7 @@ public class MaterialUseRecordController implements BusinessControllerMarker {
     @Operation(summary = "配置危化品")
 //    @PreAuthorize("@ss.hasPermission('qms:material-use-record:create')")
     public CommonResult<MaterialInfomationRespVO> makeHazardousMaterial(@Valid @RequestBody MaterialHazardousMakeSaveReqVO makeReqVO) {
-        return success(materialUseRecordService.makeHazardousMaterial(makeReqVO));
+        return success(materialUseRecordDetailService.makeHazardousMaterial(makeReqVO));
     }
 
     @PutMapping("/update")

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

@@ -0,0 +1,48 @@
+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 MaterialUseEndReuseDetailPageReqVO extends PageParam {
+
+    @Schema(description = "物料分类或大类id")
+    private Long productId;
+
+    @Schema(description = "业务类型,用完标记，清洗回收", example = "1")
+    private String businessType;
+
+    @Schema(description = "用完标记人或清洗回收人")
+    private String operator;
+
+    @Schema(description = "操作人id", example = "6934")
+    private Long operatorId;
+
+    @Schema(description = "标记日期或清洗回收日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] operatorDate;
+
+    @Schema(description = "主表id", example = "24528")
+    private Long parentId;
+
+    @Schema(description = "物料id", example = "7953")
+    private Long infomationId;
+
+    @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/MaterialUseEndReuseDetailRespVO.java

@@ -0,0 +1,67 @@
+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 MaterialUseEndReuseDetailRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1785")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "主表id", example = "24528")
+    @ExcelProperty("主表id")
+    private Long parentId;
+
+    @Schema(description = "业务类型,用完标记，清洗回收", example = "1")
+    @ExcelProperty("业务类型,用完标记，清洗回收")
+    private String businessType;
+
+    @Schema(description = "用完标记人或清洗回收人")
+    @ExcelProperty("用完标记人或清洗回收人")
+    private String operator;
+
+    @Schema(description = "操作人id", example = "6934")
+    @ExcelProperty("操作人id")
+    private Long operatorId;
+
+    @Schema(description = "标记日期或清洗回收日期")
+    @ExcelProperty("标记日期或清洗回收日期")
+    private LocalDateTime operatorDate;
+
+    @Schema(description = "物料id", example = "7953")
+    @ExcelProperty("物料id")
+    private Long infomationId;
+
+    @Schema(description = "物料名称")
+    @ExcelProperty("物料名称")
+    private String infomationName;
+
+    @Schema(description = "物料编号")
+    @ExcelProperty("物料编号")
+    private String infomationCode;
+
+    @Schema(description = "型号")
+    @ExcelProperty("型号")
+    private String modelNo;
+
+    @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/MaterialUseEndReuseDetailSaveReqVO.java

@@ -0,0 +1,25 @@
+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 MaterialUseEndReuseDetailSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1785")
+    private Long id;
+
+    @Schema(description = "主表id", example = "24528")
+    private Long parentId;
+
+    @Schema(description = "物料id", example = "7953")
+    private Long infomationId;
+
+    @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/MaterialUseEndReusePageReqVO.java

@@ -0,0 +1,42 @@
+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 MaterialUseEndReusePageReqVO extends PageParam {
+
+    @Schema(description = "物料分类或大类id")
+    private Long productId;
+
+    @Schema(description = "业务类型,用完标记，清洗回收", example = "1")
+    private String businessType;
+
+    @Schema(description = "用完标记人或清洗回收人")
+    private String operator;
+
+    @Schema(description = "操作人id", example = "6934")
+    private Long operatorId;
+
+    @Schema(description = "标记日期或清洗回收日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] operatorDate;
+
+    @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/MaterialUseEndReuseRespVO.java

@@ -0,0 +1,51 @@
+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;
+import java.util.List;
+
+@Schema(description = "管理后台 - 物料用完标记或清洗回收 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MaterialUseEndReuseRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24274")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "业务类型,用完标记，清洗回收", example = "1")
+    @ExcelProperty("业务类型,用完标记，清洗回收")
+    private String businessType;
+
+    @Schema(description = "用完标记人或清洗回收人")
+    @ExcelProperty("用完标记人或清洗回收人")
+    private String operator;
+
+    @Schema(description = "操作人id", example = "6934")
+    @ExcelProperty("操作人id")
+    private Long operatorId;
+
+    @Schema(description = "标记日期或清洗回收日期")
+    @ExcelProperty("标记日期或清洗回收日期")
+    private LocalDateTime operatorDate;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "明细数据")
+    private List<MaterialUseEndReuseDetailRespVO> children;
+
+}

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

@@ -0,0 +1,41 @@
+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 MaterialUseEndReuseSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24274")
+    private Long id;
+
+    @Schema(description = "业务类型,用完标记，清洗回收", example = "1")
+    @NotNull
+    private String businessType;
+
+    @Schema(description = "用完标记人或清洗回收人")
+    private String operator;
+
+    @Schema(description = "操作人id", example = "6934")
+    private Long operatorId;
+
+    @Schema(description = "标记日期或清洗回收日期")
+    private LocalDateTime operatorDate;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "物料ids")
+    @NotEmpty
+    private List<Long> infomationIds;
+
+}