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

@@ -172,7 +172,8 @@ 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_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料大类不存在");
+	ErrorCode MATERIAL_PRODUCT_CODE_EXISTED = new ErrorCode(1_032_160_000, "物料大类编码重复");
 	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
 	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
 

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

@@ -1,19 +1,21 @@
 package com.zt.plat.module.qms.resource.material.controller.admin;
 
-import com.zt.plat.module.qms.resource.material.controller.vo.*;
-import com.zt.plat.module.qms.resource.material.service.MaterialBatchAssignService;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchRespVO;
+import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchSaveReqVO;
+import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
+import com.zt.plat.module.qms.resource.material.service.MaterialBatchService;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
-import com.zt.plat.framework.business.annotation.FileUploadController;
-import com.zt.plat.framework.business.controller.AbstractFileUploadController;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -24,8 +26,6 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
-
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
@@ -33,26 +33,12 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
-import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
-import com.zt.plat.module.qms.resource.material.service.MaterialBatchService;
-
 @Tag(name = "管理后台 - 物料批次")
 @RestController
-@RequestMapping("/qms/resource/material-batch")
+@RequestMapping("/qms/material-batch")
 @Validated
-@DeptDataPermissionIgnore(enable = "true")
-@FileUploadController(source = "qms.materialbatch")
-public class MaterialBatchController extends AbstractFileUploadController implements BusinessControllerMarker{
+public class MaterialBatchController implements BusinessControllerMarker {
 
-    @Resource
-    private MaterialBatchAssignService materialBatchAssignService;
-
-    static {
-        FileUploadController annotation = MaterialBatchController.class.getAnnotation(FileUploadController.class);
-        if (annotation != null) {
-        setFileUploadInfo(annotation);
-        }
-    }
 
     @Resource
     private MaterialBatchService materialBatchService;
@@ -120,10 +106,4 @@ public class MaterialBatchController extends AbstractFileUploadController implem
                         BeanUtils.toBean(list, MaterialBatchRespVO.class));
     }
 
-    @PostMapping("/assign")
-    @Operation(summary = "物料分发")
-    public CommonResult<MaterialBatchAssignRespVO> assign(@Valid @RequestBody MaterialBatchAssignSaveReqVO createReqVO) {
-        return success(materialBatchAssignService.assignLab(createReqVO));
-    }
-
 }