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

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

@@ -150,9 +150,15 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
 
+
 	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
 	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
 
+	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次不存在");
+	ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次分发不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库，出库不存在");
+	ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库明细,出库明细等不存在");
+
 
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
 

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

@@ -0,0 +1,40 @@
+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 MaterialBatchAssignPageReqVO extends PageParam {
+
+    @Schema(description = "源批次ID", example = "23099")
+    private Long batchId;
+
+    @Schema(description = "产品id", example = "10774")
+    private String productId;
+
+    @Schema(description = "库房ID", example = "24720")
+    private Long warehouseId;
+
+    @Schema(description = "数量")
+    private String inboundQuantity;
+
+    @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn")
+    private String url;
+
+    @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/MaterialBatchAssignRespVO.java

@@ -0,0 +1,50 @@
+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 MaterialBatchAssignRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15114")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "源批次ID", example = "23099")
+    @ExcelProperty("源批次ID")
+    private Long batchId;
+
+    @Schema(description = "产品id", example = "10774")
+    @ExcelProperty("产品id")
+    private String productId;
+
+    @Schema(description = "库房ID", example = "24720")
+    @ExcelProperty("库房ID")
+    private Long warehouseId;
+
+    @Schema(description = "数量")
+    @ExcelProperty("数量")
+    private String inboundQuantity;
+
+    @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn")
+    @ExcelProperty("暂存位置记录")
+    private String url;
+
+    @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/MaterialBatchAssignSaveReqVO.java

@@ -0,0 +1,34 @@
+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 MaterialBatchAssignSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15114")
+    private Long id;
+
+    @Schema(description = "源批次ID", example = "23099")
+    private Long batchId;
+
+    @Schema(description = "产品id", example = "10774")
+    private String productId;
+
+    @Schema(description = "库房ID", example = "24720")
+    private Long warehouseId;
+
+    @Schema(description = "数量")
+    private String inboundQuantity;
+
+    @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn")
+    private String url;
+
+    @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/MaterialBatchPageReqVO.java

@@ -0,0 +1,51 @@
+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 MaterialBatchPageReqVO extends PageParam {
+
+    @Schema(description = "产品id", example = "16851")
+    private Long productId;
+
+    @Schema(description = "批次编号")
+    private String batchNo;
+
+    @Schema(description = "总数量")
+    private String inboundQuantity;
+
+    @Schema(description = "存放位置描述")
+    private String location;
+
+    @Schema(description = "供应商id", example = "6956")
+    private Long supplierId;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] manufacturerDate;
+
+    @Schema(description = "到期日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] dueDate;
+
+    @Schema(description = "验收状态", example = "1")
+    private String acceptanceStatus;
+
+    @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/MaterialBatchRespVO.java

@@ -0,0 +1,62 @@
+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 MaterialBatchRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25470")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "产品id", example = "16851")
+    @ExcelProperty("产品id")
+    private Long productId;
+
+    @Schema(description = "批次编号")
+    @ExcelProperty("批次编号")
+    private String batchNo;
+
+    @Schema(description = "总数量")
+    @ExcelProperty("总数量")
+    private String inboundQuantity;
+
+    @Schema(description = "存放位置描述")
+    @ExcelProperty("存放位置描述")
+    private String location;
+
+    @Schema(description = "供应商id", example = "6956")
+    @ExcelProperty("供应商id")
+    private Long supplierId;
+
+    @Schema(description = "生产日期")
+    @ExcelProperty("生产日期")
+    private LocalDateTime manufacturerDate;
+
+    @Schema(description = "到期日期")
+    @ExcelProperty("到期日期")
+    private LocalDateTime dueDate;
+
+    @Schema(description = "验收状态", example = "1")
+    @ExcelProperty("验收状态")
+    private String acceptanceStatus;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}