fix:完善批次接口，准备物料验收入库模块及验收新建接口。

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

@@ -185,7 +185,7 @@ 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, "入库明细,出库明细等不存在");

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

@@ -17,8 +17,8 @@ import java.time.LocalDateTime;
 @Data
 public class MaterialBatchSaveReqVO {
 
-    @Null(groups = AddGroup.class, message = "新增数据 ID 必须为空")
+    @Null(groups = AddGroup.class, message = "新增操作 id必须为空")
-    @NotNull(groups = UpdateGroup.class, message = "修改数据 ID 不能为空")
+    @NotNull(groups = UpdateGroup.class, message = "修改操作 id不能为空")
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9716")
     private Long id;
 

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

@@ -0,0 +1,54 @@
+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 MaterialInventoryInboundDetailPageReqVO extends PageParam {
+
+    @Schema(description = "入库单ID", example = "30205")
+    private Long inboundId;
+
+    @Schema(description = "批次id", example = "16666")
+    private Long batchId;
+
+    @Schema(description = "批次工段id", example = "1454")
+    private Long batchGongduanId;
+
+    @Schema(description = "物料实例ID", example = "17457")
+    private Long materialInfomationId;
+
+    @Schema(description = "入库人", example = "赵六")
+    private String inboundUserName;
+
+    @Schema(description = "入库人id", example = "6313")
+    private Long inboundUserId;
+
+    @Schema(description = "入库人部门", example = "张三")
+    private String inboundDepartmentName;
+
+    @Schema(description = "入库人部门id", example = "10963")
+    private Long inboundDepartmentId;
+
+    @Schema(description = "入库时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] inboundTime;
+
+    @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/MaterialInventoryInboundDetailRespVO.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 MaterialInventoryInboundDetailRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31154")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "入库单ID", example = "30205")
+    @ExcelProperty("入库单ID")
+    private Long inboundId;
+
+    @Schema(description = "批次id", example = "16666")
+    @ExcelProperty("批次id")
+    private Long batchId;
+
+    @Schema(description = "批次工段id", example = "1454")
+    @ExcelProperty("批次工段id")
+    private Long batchGongduanId;
+
+    @Schema(description = "物料实例ID", example = "17457")
+    @ExcelProperty("物料实例ID")
+    private Long materialInfomationId;
+
+    @Schema(description = "入库人", example = "赵六")
+    @ExcelProperty("入库人")
+    private String inboundUserName;
+
+    @Schema(description = "入库人id", example = "6313")
+    @ExcelProperty("入库人id")
+    private Long inboundUserId;
+
+    @Schema(description = "入库人部门", example = "张三")
+    @ExcelProperty("入库人部门")
+    private String inboundDepartmentName;
+
+    @Schema(description = "入库人部门id", example = "10963")
+    @ExcelProperty("入库人部门id")
+    private Long inboundDepartmentId;
+
+    @Schema(description = "入库时间")
+    @ExcelProperty("入库时间")
+    private LocalDateTime inboundTime;
+
+    @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/MaterialInventoryInboundDetailSaveReqVO.java

@@ -0,0 +1,48 @@
+package com.zt.plat.module.qms.resource.material.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 入库明细,验收入库、盘盈入库等新增/修改 Request VO")
+@Data
+public class MaterialInventoryInboundDetailSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31154")
+    private Long id;
+
+    @Schema(description = "入库单ID", example = "30205")
+    private Long inboundId;
+
+    @Schema(description = "批次id", example = "16666")
+    private Long batchId;
+
+    @Schema(description = "批次工段id", example = "1454")
+    private Long batchGongduanId;
+
+    @Schema(description = "物料实例ID", example = "17457")
+    private Long materialInfomationId;
+
+    @Schema(description = "入库人", example = "赵六")
+    private String inboundUserName;
+
+    @Schema(description = "入库人id", example = "6313")
+    private Long inboundUserId;
+
+    @Schema(description = "入库人部门", example = "张三")
+    private String inboundDepartmentName;
+
+    @Schema(description = "入库人部门id", example = "10963")
+    private Long inboundDepartmentId;
+
+    @Schema(description = "入库时间")
+    private LocalDateTime inboundTime;
+
+    @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/MaterialInventoryInboundPageReqVO.java

@@ -0,0 +1,60 @@
+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 MaterialInventoryInboundPageReqVO extends PageParam {
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "业务类型,【字典】【jy_material_in_bsn_type】验收入库、盘盈入库等", example = "2")
+    private String businessType;
+
+    @Schema(description = "业务类型编码")
+    private String businessTypeCode;
+
+    @Schema(description = "申请人")
+    private String applyUser;
+
+    @Schema(description = "申请人id", example = "18778")
+    private Long applyUserId;
+
+    @Schema(description = "申请部门")
+    private String applyDepartment;
+
+    @Schema(description = "申请部门id", example = "29535")
+    private Long applyDepartmentId;
+
+    @Schema(description = "申请时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] applyTime;
+
+    @Schema(description = "流程实例id", example = "16660")
+    private String flowInstanceId;
+
+    @Schema(description = "流程审批状态", example = "1")
+    private String flowStatus;
+
+    @Schema(description = "意见json")
+    private String commentJson;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}