Compare commits
2 Commits
b408d1e726
...
99b6521c19
| Author | SHA1 | Date | |
|---|---|---|---|
|
99b6521c19 | ||
|
|
215ec8b5aa |
@@ -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, "物料通用流程不存在");
|
||||
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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 static com.zt.plat.framework.common.pojo.CommonResult.error;
|
||||
|
||||
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 static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_BATCH_ASSIGN_NOT_EXISTS;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialBatchAssignService;
|
||||
|
||||
@Tag(name = "管理后台 - 物料批次分发")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-batch-assign")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialbatchassign")
|
||||
public class MaterialBatchAssignController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialBatchAssignController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialBatchAssignService materialBatchAssignService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建物料批次分发")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:create')")
|
||||
public CommonResult<MaterialBatchAssignRespVO> createMaterialBatchAssign(@Valid @RequestBody MaterialBatchAssignSaveReqVO createReqVO) {
|
||||
return success(materialBatchAssignService.createMaterialBatchAssign(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新物料批次分发")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:update')")
|
||||
public CommonResult<Boolean> updateMaterialBatchAssign(@Valid @RequestBody MaterialBatchAssignSaveReqVO updateReqVO) {
|
||||
materialBatchAssignService.updateMaterialBatchAssign(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除物料批次分发")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialBatchAssign(@RequestParam("id") Long id) {
|
||||
materialBatchAssignService.deleteMaterialBatchAssign(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除物料批次分发")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialBatchAssignList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialBatchAssignService.deleteMaterialBatchAssignListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得物料批次分发")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')")
|
||||
public CommonResult<MaterialBatchAssignRespVO> getMaterialBatchAssign(@RequestParam("id") Long id) {
|
||||
MaterialBatchAssignDO materialBatchAssign = materialBatchAssignService.getMaterialBatchAssign(id);
|
||||
return success(BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/get-by-inf")
|
||||
@Operation(summary = "获得物料批次分发")
|
||||
@Parameter(name = "productId", description = "产品大类编号", required = true)
|
||||
// @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')")
|
||||
public CommonResult<PageResult<MaterialBatchAssignRespVO>> getMaterialBatchAssignByInfiId(MaterialBatchAssignPageReqVO pageReqVO) {
|
||||
|
||||
if(pageReqVO.getMaterialInfomationId()==null||pageReqVO.getMaterialInfomationId().length()==0){
|
||||
return error(MATERIAL_BATCH_ASSIGN_NOT_EXISTS,"示例编号不能为空");
|
||||
}
|
||||
|
||||
PageResult<MaterialBatchAssignDO> pageResult = materialBatchAssignService.getMaterialBatchAssignByInfId(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialBatchAssignRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料批次分发分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')")
|
||||
public CommonResult<PageResult<MaterialBatchAssignRespVO>> getMaterialBatchAssignPage(@Valid MaterialBatchAssignPageReqVO pageReqVO) {
|
||||
PageResult<MaterialBatchAssignDO> pageResult = materialBatchAssignService.getMaterialBatchAssignPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialBatchAssignRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出物料批次分发 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-batch-assign:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialBatchAssignExcel(@Valid MaterialBatchAssignPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialBatchAssignDO> list = materialBatchAssignService.getMaterialBatchAssignPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "物料批次分发.xls", "数据", MaterialBatchAssignRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialBatchAssignRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,69 +1,59 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
|
||||
import com.zt.plat.framework.business.annotation.FileUploadController;
|
||||
import com.zt.plat.framework.business.controller.AbstractFileUploadController;
|
||||
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
import com.zt.plat.module.qms.core.constant.DataTypeConstant;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInfomationService;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialProductService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
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 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.*;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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 static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
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.*;
|
||||
|
||||
|
||||
@Tag(name = "管理后台 - 物料实例")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-infomation")
|
||||
@RequestMapping("/qms/material-infomation")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "resource.materialinfomation")
|
||||
public class MaterialInfomationController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
public class MaterialInfomationController implements BusinessControllerMarker {
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInfomationController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource private MaterialInfomationService materialInfomationService;
|
||||
@Resource private MaterialProductService materialProductService;
|
||||
@Resource
|
||||
private MaterialInfomationService materialInfomationService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建物料实例")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:create')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:create')")
|
||||
public CommonResult<MaterialInfomationRespVO> createMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO createReqVO) {
|
||||
return success(materialInfomationService.createMaterialInfomation(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新物料实例")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:update')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:update')")
|
||||
public CommonResult<Boolean> updateMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO updateReqVO) {
|
||||
materialInfomationService.updateMaterialInfomation(updateReqVO);
|
||||
return success(true);
|
||||
@@ -72,7 +62,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除物料实例")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:delete')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInfomation(@RequestParam("id") Long id) {
|
||||
materialInfomationService.deleteMaterialInfomation(id);
|
||||
return success(true);
|
||||
@@ -81,7 +71,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除物料实例")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:delete')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInfomationList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInfomationService.deleteMaterialInfomationListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -90,7 +80,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得物料实例")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:query')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:query')")
|
||||
public CommonResult<MaterialInfomationRespVO> getMaterialInfomation(@RequestParam("id") Long id) {
|
||||
MaterialInfomationDO materialInfomation = materialInfomationService.getMaterialInfomation(id);
|
||||
return success(BeanUtils.toBean(materialInfomation, MaterialInfomationRespVO.class));
|
||||
@@ -98,24 +88,15 @@ public class MaterialInfomationController extends AbstractFileUploadController i
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料实例分页")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:query')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:query')")
|
||||
public CommonResult<PageResult<MaterialInfomationRespVO>> getMaterialInfomationPage(@Valid MaterialInfomationPageReqVO pageReqVO) {
|
||||
|
||||
Long productId = pageReqVO.getProductId();
|
||||
if(productId != null){
|
||||
List<MaterialProductDO> productDOList = materialProductService.listByIdPath(productId, DataTypeConstant.DATA_TYPE_DATA);
|
||||
List<Long> productIds = productDOList.stream().map(MaterialProductDO::getId).toList();
|
||||
pageReqVO.setProductIds(productIds);
|
||||
pageReqVO.setProductId(null);
|
||||
}
|
||||
|
||||
PageResult<MaterialInfomationDO> pageResult = materialInfomationService.getMaterialInfomationPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInfomationRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出物料实例 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-infomation:export')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-infomation:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInfomationExcel(@Valid MaterialInfomationPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryCheckBatchDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckBatchService;
|
||||
|
||||
@Tag(name = "管理后台 - 库存盘点项")
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-inventory-check-batch")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventorycheckbatch")
|
||||
public class MaterialInventoryCheckBatchController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryCheckBatchController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryCheckBatchService materialInventoryCheckBatchService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建库存盘点项")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:create')")
|
||||
public CommonResult<MaterialInventoryCheckBatchRespVO> createMaterialInventoryCheckBatch(@Valid @RequestBody MaterialInventoryCheckBatchSaveReqVO createReqVO) {
|
||||
return success(materialInventoryCheckBatchService.createMaterialInventoryCheckBatch(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新库存盘点项")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryCheckBatch(@Valid @RequestBody MaterialInventoryCheckBatchSaveReqVO updateReqVO) {
|
||||
materialInventoryCheckBatchService.updateMaterialInventoryCheckBatch(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除库存盘点项")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheckBatch(@RequestParam("id") Long id) {
|
||||
materialInventoryCheckBatchService.deleteMaterialInventoryCheckBatch(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除库存盘点项")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheckBatchList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryCheckBatchService.deleteMaterialInventoryCheckBatchListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得库存盘点项")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:query')")
|
||||
public CommonResult<MaterialInventoryCheckBatchRespVO> getMaterialInventoryCheckBatch(@RequestParam("id") Long id) {
|
||||
MaterialInventoryCheckBatchDO materialInventoryCheckBatch = materialInventoryCheckBatchService.getMaterialInventoryCheckBatch(id);
|
||||
return success(BeanUtils.toBean(materialInventoryCheckBatch, MaterialInventoryCheckBatchRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得库存盘点项分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryCheckBatchRespVO>> getMaterialInventoryCheckBatchPage(@Valid MaterialInventoryCheckBatchPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryCheckBatchDO> pageResult = materialInventoryCheckBatchService.getMaterialInventoryCheckBatchPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckBatchRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出库存盘点项 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryCheckBatchExcel(@Valid MaterialInventoryCheckBatchPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryCheckBatchDO> list = materialInventoryCheckBatchService.getMaterialInventoryCheckBatchPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "库存盘点项.xls", "数据", MaterialInventoryCheckBatchRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryCheckBatchRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,138 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryCheckDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckService;
|
||||
|
||||
@Tag(name = "管理后台 - 库存盘点")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-inventory-check")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventorycheck")
|
||||
public class MaterialInventoryCheckController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryCheckController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryCheckService materialInventoryCheckService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建库存盘点")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:create')")
|
||||
public CommonResult<MaterialInventoryCheckRespVO> createMaterialInventoryCheck(@Valid @RequestBody MaterialInventoryCheckSaveReqVO createReqVO) {
|
||||
return success(materialInventoryCheckService.createMaterialInventoryCheck(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新库存盘点")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryCheck(@Valid @RequestBody MaterialInventoryCheckSaveReqVO updateReqVO) {
|
||||
materialInventoryCheckService.updateMaterialInventoryCheck(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除库存盘点")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheck(@RequestParam("id") Long id) {
|
||||
materialInventoryCheckService.deleteMaterialInventoryCheck(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除库存盘点")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheckList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryCheckService.deleteMaterialInventoryCheckListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得库存盘点")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')")
|
||||
public CommonResult<MaterialInventoryCheckRespVO> getMaterialInventoryCheck(@RequestParam("id") Long id) {
|
||||
MaterialInventoryCheckDO materialInventoryCheck = materialInventoryCheckService.getMaterialInventoryCheck(id);
|
||||
return success(BeanUtils.toBean(materialInventoryCheck, MaterialInventoryCheckRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得库存盘点分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryCheckRespVO>> getMaterialInventoryCheckPage(@Valid MaterialInventoryCheckPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryCheckDO> pageResult = materialInventoryCheckService.getMaterialInventoryCheckPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出库存盘点 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryCheckExcel(@Valid MaterialInventoryCheckPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryCheckDO> list = materialInventoryCheckService.getMaterialInventoryCheckPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "库存盘点.xls", "数据", MaterialInventoryCheckRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryCheckRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/create-form")
|
||||
@Operation(summary = "创建库存盘点")
|
||||
public CommonResult<MaterialInventoryCheckRespVO> createMaterialInventoryCheckForm(@Valid @RequestBody MaterialInventoryCheckSaveReqVO createReqVO) {
|
||||
|
||||
|
||||
return success(materialInventoryCheckService.createMaterialInventoryCheckForm(createReqVO));
|
||||
}
|
||||
|
||||
@GetMapping("/get-form")
|
||||
@Operation(summary = "获得库存盘点")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')")
|
||||
public CommonResult<MaterialInventoryCheckRespVO> getMaterialInventoryCheckForm(@RequestParam("id") Long id) {
|
||||
|
||||
return success(materialInventoryCheckService.getMaterialInventoryCheckForm(id));
|
||||
}
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryCheckDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckDetailService;
|
||||
|
||||
@Tag(name = "管理后台 - 库存盘点明细")
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-inventory-check-detail")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventorycheckdetail")
|
||||
public class MaterialInventoryCheckDetailController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryCheckDetailController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryCheckDetailService materialInventoryCheckDetailService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建库存盘点明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:create')")
|
||||
public CommonResult<MaterialInventoryCheckDetailRespVO> createMaterialInventoryCheckDetail(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO createReqVO) {
|
||||
return success(materialInventoryCheckDetailService.createMaterialInventoryCheckDetail(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新库存盘点明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryCheckDetail(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO updateReqVO) {
|
||||
materialInventoryCheckDetailService.updateMaterialInventoryCheckDetail(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除库存盘点明细")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheckDetail(@RequestParam("id") Long id) {
|
||||
materialInventoryCheckDetailService.deleteMaterialInventoryCheckDetail(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除库存盘点明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryCheckDetailList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryCheckDetailService.deleteMaterialInventoryCheckDetailListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得库存盘点明细")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:query')")
|
||||
public CommonResult<MaterialInventoryCheckDetailRespVO> getMaterialInventoryCheckDetail(@RequestParam("id") Long id) {
|
||||
MaterialInventoryCheckDetailDO materialInventoryCheckDetail = materialInventoryCheckDetailService.getMaterialInventoryCheckDetail(id);
|
||||
return success(BeanUtils.toBean(materialInventoryCheckDetail, MaterialInventoryCheckDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得库存盘点明细分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryCheckDetailRespVO>> getMaterialInventoryCheckDetailPage(@Valid MaterialInventoryCheckDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryCheckDetailDO> pageResult = materialInventoryCheckDetailService.getMaterialInventoryCheckDetailPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出库存盘点明细 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryCheckDetailExcel(@Valid MaterialInventoryCheckDetailPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryCheckDetailDO> list = materialInventoryCheckDetailService.getMaterialInventoryCheckDetailPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "库存盘点明细.xls", "数据", MaterialInventoryCheckDetailRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryCheckDetailRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,153 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
|
||||
import com.zt.plat.framework.business.annotation.FileUploadController;
|
||||
import com.zt.plat.framework.business.controller.AbstractFileUploadController;
|
||||
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
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.MaterialInventoryDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundDetailService;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryService;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialProductService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-inventory")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materiainfo")
|
||||
public class MaterialInventoryController extends AbstractFileUploadController implements BusinessControllerMarker {
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryInboundDetailService materialInventoryInboundDetailService;
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryService mterialInventoryService;
|
||||
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:create')")
|
||||
public CommonResult<MaterialInventoryInboundDetailRespVO> createMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO createReqVO) {
|
||||
return success(materialInventoryInboundDetailService.createMaterialInventoryInboundDetail(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO updateReqVO) {
|
||||
materialInventoryInboundDetailService.updateMaterialInventoryInboundDetail(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInboundDetail(@RequestParam("id") Long id) {
|
||||
materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetail(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInboundDetailList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetailListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')")
|
||||
public CommonResult<MaterialInventoryInboundDetailRespVO> getMaterialInventoryInboundDetail(@RequestParam("id") Long id) {
|
||||
MaterialInventoryInboundDetailDO materialInventoryInboundDetail = materialInventoryInboundDetailService.getMaterialInventoryInboundDetail(id);
|
||||
return success(BeanUtils.toBean(materialInventoryInboundDetail, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得库存明细")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryInboundDetailDO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryInboundDetailExcel(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryInboundDetailDO> list = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryInboundDetailRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/getList")
|
||||
@Operation(summary = "获得库存列表")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
public CommonResult<PageResult<MaterialInventoryRespVO>> getMaterialProduct(MaterialInventoryRespVO pageReqVO) {
|
||||
|
||||
PageResult<MaterialInventoryDO> pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/get_mtrl_inf")
|
||||
@Operation(summary = "获取实例列表")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
public CommonResult<PageResult<MaterialInventoryRespVO>> getInfomation(MaterialInventoryRespVO pageReqVO) {
|
||||
|
||||
PageResult<MaterialInventoryDO> pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/agree-out")
|
||||
@Operation(summary = "同意出库")
|
||||
@Parameter(name = "id", description = "出库单id", required = true)
|
||||
public CommonResult<Boolean> agreeOut(@RequestParam("outId") Long outId) {
|
||||
|
||||
// PageResult<MaterialInventoryDO> pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO);
|
||||
// return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class));
|
||||
mterialInventoryService.agreeMaterialInventoryOutbound(outId);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,135 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundSaveReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryInboundDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundService;
|
||||
|
||||
@Tag(name = "管理后台 - 入库")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-inventory-inbound")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventoryinbound")
|
||||
public class MaterialInventoryInboundController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryInboundController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryInboundService materialInventoryInboundService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建入库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:create')")
|
||||
public CommonResult<MaterialInventoryInboundRespVO> createMaterialInventoryInbound(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
|
||||
return success(materialInventoryInboundService.createMaterialInventoryInbound(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新入库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryInbound(@Valid @RequestBody MaterialInventoryInboundSaveReqVO updateReqVO) {
|
||||
materialInventoryInboundService.updateMaterialInventoryInbound(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除入库")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInbound(@RequestParam("id") Long id) {
|
||||
materialInventoryInboundService.deleteMaterialInventoryInbound(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除入库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInboundList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryInboundService.deleteMaterialInventoryInboundListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得入库")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:query')")
|
||||
public CommonResult<MaterialInventoryInboundRespVO> getMaterialInventoryInbound(@RequestParam("id") Long id) {
|
||||
MaterialInventoryInboundDO materialInventoryInbound = materialInventoryInboundService.getMaterialInventoryInbound(id);
|
||||
return success(BeanUtils.toBean(materialInventoryInbound, MaterialInventoryInboundRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得入库分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryInboundRespVO>> getMaterialInventoryInboundPage(@Valid MaterialInventoryInboundPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryInboundDO> pageResult = materialInventoryInboundService.getMaterialInventoryInboundPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出入库 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryInboundExcel(@Valid MaterialInventoryInboundPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryInboundDO> list = materialInventoryInboundService.getMaterialInventoryInboundPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "入库.xls", "数据", MaterialInventoryInboundRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryInboundRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/multi-put")
|
||||
@Operation(summary = "批量上架")
|
||||
public CommonResult<Boolean> createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
|
||||
materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@PostMapping("single-put")
|
||||
@Operation(summary = "单一上架")
|
||||
public CommonResult<PageResult<MaterialInventoryInboundRespVO>> createMaterialInventoryInboundSingle(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) {
|
||||
return success(materialInventoryInboundService.singleCreateMaterialInventoryInbound(createReqVO));
|
||||
}
|
||||
}
|
||||
@@ -1,127 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryInboundDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundDetailService;
|
||||
|
||||
@Tag(name = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-inventory-inbound-detail")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventoryinbounddetail")
|
||||
public class MaterialInventoryInboundDetailController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryInboundDetailController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryInboundDetailService materialInventoryInboundDetailService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:create')")
|
||||
public CommonResult<MaterialInventoryInboundDetailRespVO> createMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO createReqVO) {
|
||||
return success(materialInventoryInboundDetailService.createMaterialInventoryInboundDetail(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO updateReqVO) {
|
||||
materialInventoryInboundDetailService.updateMaterialInventoryInboundDetail(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInboundDetail(@RequestParam("id") Long id) {
|
||||
materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetail(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryInboundDetailList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetailListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')")
|
||||
public CommonResult<MaterialInventoryInboundDetailRespVO> getMaterialInventoryInboundDetail(@RequestParam("id") Long id) {
|
||||
MaterialInventoryInboundDetailDO materialInventoryInboundDetail = materialInventoryInboundDetailService.getMaterialInventoryInboundDetail(id);
|
||||
return success(BeanUtils.toBean(materialInventoryInboundDetail, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryInboundDetailPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryInboundDetailDO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryInboundDetailExcel(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryInboundDetailDO> list = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryInboundDetailRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page-list")
|
||||
@Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
|
||||
public CommonResult<PageResult<MaterialInventoryInboundDetailRespVO>> getMaterialInventoryInboundDetailPageList(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryInboundDetailRespVO> pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPageList(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class));
|
||||
}
|
||||
}
|
||||
@@ -1,129 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryOutboundDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryOutboundService;
|
||||
|
||||
@Tag(name = "管理后台 - 出库")
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-inventory-outbound")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventoryoutbound")
|
||||
public class MaterialInventoryOutboundController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryOutboundController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryOutboundService materialInventoryOutboundService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建出库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:create')")
|
||||
public CommonResult<MaterialInventoryOutboundRespVO> createMaterialInventoryOutbound(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO createReqVO) {
|
||||
return success(materialInventoryOutboundService.createMaterialInventoryOutbound(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新出库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryOutbound(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO updateReqVO) {
|
||||
materialInventoryOutboundService.updateMaterialInventoryOutbound(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除出库")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryOutbound(@RequestParam("id") Long id) {
|
||||
materialInventoryOutboundService.deleteMaterialInventoryOutbound(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除出库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryOutboundList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryOutboundService.deleteMaterialInventoryOutboundListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得出库")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:query')")
|
||||
public CommonResult<MaterialInventoryOutboundRespVO> getMaterialInventoryOutbound(@RequestParam("id") Long id) {
|
||||
MaterialInventoryOutboundDO materialInventoryOutbound = materialInventoryOutboundService.getMaterialInventoryOutbound(id);
|
||||
return success(BeanUtils.toBean(materialInventoryOutbound, MaterialInventoryOutboundRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得出库分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryOutboundRespVO>> getMaterialInventoryOutboundPage(@Valid MaterialInventoryOutboundPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryOutboundDO> pageResult = materialInventoryOutboundService.getMaterialInventoryOutboundPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryOutboundRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出出库 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryOutboundExcel(@Valid MaterialInventoryOutboundPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryOutboundDO> list = materialInventoryOutboundService.getMaterialInventoryOutboundPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "出库.xls", "数据", MaterialInventoryOutboundRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryOutboundRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/create-all")
|
||||
@Operation(summary = "创建出库")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:create')")
|
||||
public CommonResult<MaterialInventoryOutboundRespVO> createMaterialInventoryOutboundAll(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO createReqVO) {
|
||||
return success(materialInventoryOutboundService.createMaterialInventoryOutboundAll(createReqVO));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialInventoryOutboundDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryOutboundDetailService;
|
||||
|
||||
@Tag(name = "管理后台 - 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-inventory-outbound-detail")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materialinventoryoutbounddetail")
|
||||
public class MaterialInventoryOutboundDetailController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialInventoryOutboundDetailController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryOutboundDetailService materialInventoryOutboundDetailService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:create')")
|
||||
public CommonResult<MaterialInventoryOutboundDetailRespVO> createMaterialInventoryOutboundDetail(@Valid @RequestBody MaterialInventoryOutboundDetailSaveReqVO createReqVO) {
|
||||
return success(materialInventoryOutboundDetailService.createMaterialInventoryOutboundDetail(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:update')")
|
||||
public CommonResult<Boolean> updateMaterialInventoryOutboundDetail(@Valid @RequestBody MaterialInventoryOutboundDetailSaveReqVO updateReqVO) {
|
||||
materialInventoryOutboundDetailService.updateMaterialInventoryOutboundDetail(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryOutboundDetail(@RequestParam("id") Long id) {
|
||||
materialInventoryOutboundDetailService.deleteMaterialInventoryOutboundDetail(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialInventoryOutboundDetailList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialInventoryOutboundDetailService.deleteMaterialInventoryOutboundDetailListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:query')")
|
||||
public CommonResult<MaterialInventoryOutboundDetailRespVO> getMaterialInventoryOutboundDetail(@RequestParam("id") Long id) {
|
||||
MaterialInventoryOutboundDetailDO materialInventoryOutboundDetail = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetail(id);
|
||||
return success(BeanUtils.toBean(materialInventoryOutboundDetail, MaterialInventoryOutboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:query')")
|
||||
public CommonResult<PageResult<MaterialInventoryOutboundDetailRespVO>> getMaterialInventoryOutboundDetailPage(@Valid MaterialInventoryOutboundDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialInventoryOutboundDetailDO> pageResult = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetailPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialInventoryOutboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialInventoryOutboundDetailExcel(@Valid MaterialInventoryOutboundDetailPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialInventoryOutboundDetailDO> list = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetailPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryOutboundDetailRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialInventoryOutboundDetailRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialLifecycleDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleService;
|
||||
|
||||
@Tag(name = "管理后台 - 物料通用流程")
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-lifecycle")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materiallifecycle")
|
||||
public class MaterialLifecycleController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialLifecycleController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialLifecycleService materialLifecycleService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建物料通用流程")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:create')")
|
||||
public CommonResult<MaterialLifecycleRespVO> createMaterialLifecycle(@Valid @RequestBody MaterialLifecycleSaveReqVO createReqVO) {
|
||||
return success(materialLifecycleService.createMaterialLifecycle(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新物料通用流程")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:update')")
|
||||
public CommonResult<Boolean> updateMaterialLifecycle(@Valid @RequestBody MaterialLifecycleSaveReqVO updateReqVO) {
|
||||
materialLifecycleService.updateMaterialLifecycle(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除物料通用流程")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialLifecycle(@RequestParam("id") Long id) {
|
||||
materialLifecycleService.deleteMaterialLifecycle(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除物料通用流程")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialLifecycleList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialLifecycleService.deleteMaterialLifecycleListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得物料通用流程")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:query')")
|
||||
public CommonResult<MaterialLifecycleRespVO> getMaterialLifecycle(@RequestParam("id") Long id) {
|
||||
MaterialLifecycleDO materialLifecycle = materialLifecycleService.getMaterialLifecycle(id);
|
||||
return success(BeanUtils.toBean(materialLifecycle, MaterialLifecycleRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料通用流程分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:query')")
|
||||
public CommonResult<PageResult<MaterialLifecycleRespVO>> getMaterialLifecyclePage(@Valid MaterialLifecyclePageReqVO pageReqVO) {
|
||||
PageResult<MaterialLifecycleDO> pageResult = materialLifecycleService.getMaterialLifecyclePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialLifecycleRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出物料通用流程 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialLifecycleExcel(@Valid MaterialLifecyclePageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialLifecycleDO> list = materialLifecycleService.getMaterialLifecyclePage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "物料通用流程.xls", "数据", MaterialLifecycleRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialLifecycleRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailSaveReqVO;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
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;
|
||||
|
||||
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.MaterialLifecycleDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleDetailService;
|
||||
|
||||
@Tag(name = "管理后台 - 物料通用流程明细,对应生命周期的明细")
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-lifecycle-detail")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materiallifecycledetail")
|
||||
public class MaterialLifecycleDetailController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialLifecycleDetailController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialLifecycleDetailService materialLifecycleDetailService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建物料通用流程明细,对应生命周期的明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:create')")
|
||||
public CommonResult<MaterialLifecycleDetailRespVO> createMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO createReqVO) {
|
||||
return success(materialLifecycleDetailService.createMaterialLifecycleDetail(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新物料通用流程明细,对应生命周期的明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:update')")
|
||||
public CommonResult<Boolean> updateMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO updateReqVO) {
|
||||
materialLifecycleDetailService.updateMaterialLifecycleDetail(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除物料通用流程明细,对应生命周期的明细")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialLifecycleDetail(@RequestParam("id") Long id) {
|
||||
materialLifecycleDetailService.deleteMaterialLifecycleDetail(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除物料通用流程明细,对应生命周期的明细")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialLifecycleDetailList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialLifecycleDetailService.deleteMaterialLifecycleDetailListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得物料通用流程明细,对应生命周期的明细")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:query')")
|
||||
public CommonResult<MaterialLifecycleDetailRespVO> getMaterialLifecycleDetail(@RequestParam("id") Long id) {
|
||||
MaterialLifecycleDetailDO materialLifecycleDetail = materialLifecycleDetailService.getMaterialLifecycleDetail(id);
|
||||
return success(BeanUtils.toBean(materialLifecycleDetail, MaterialLifecycleDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料通用流程明细,对应生命周期的明细分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:query')")
|
||||
public CommonResult<PageResult<MaterialLifecycleDetailRespVO>> getMaterialLifecycleDetailPage(@Valid MaterialLifecycleDetailPageReqVO pageReqVO) {
|
||||
PageResult<MaterialLifecycleDetailDO> pageResult = materialLifecycleDetailService.getMaterialLifecycleDetailPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialLifecycleDetailRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出物料通用流程明细,对应生命周期的明细 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialLifecycleDetailExcel(@Valid MaterialLifecycleDetailPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MaterialLifecycleDetailDO> list = materialLifecycleDetailService.getMaterialLifecycleDetailPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "物料通用流程明细,对应生命周期的明细.xls", "数据", MaterialLifecycleDetailRespVO.class,
|
||||
BeanUtils.toBean(list, MaterialLifecycleDetailRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,13 +8,12 @@ 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.*;
|
||||
@@ -25,8 +24,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;
|
||||
@@ -41,16 +38,8 @@ import com.zt.plat.module.qms.resource.material.service.MaterialLocationService;
|
||||
@RestController
|
||||
@RequestMapping("/qms/material-location")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "qms.materiallocation")
|
||||
public class MaterialLocationController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
public class MaterialLocationController implements BusinessControllerMarker {
|
||||
|
||||
static {
|
||||
FileUploadController annotation = MaterialLocationController.class.getAnnotation(FileUploadController.class);
|
||||
if (annotation != null) {
|
||||
setFileUploadInfo(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
@Resource
|
||||
private MaterialLocationService materialLocationService;
|
||||
|
||||
@@ -9,10 +9,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
|
||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||
import com.zt.plat.module.qms.core.constant.DataTypeConstant;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO;
|
||||
@@ -38,7 +35,6 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
|
||||
@RestController
|
||||
@RequestMapping("/qms/resource/material-product")
|
||||
@Validated
|
||||
@DeptDataPermissionIgnore(enable = "true")
|
||||
@FileUploadController(source = "resource.materialproduct")
|
||||
public class MaterialProductController extends AbstractFileUploadController implements BusinessControllerMarker{
|
||||
|
||||
@@ -52,51 +48,54 @@ public class MaterialProductController extends AbstractFileUploadController impl
|
||||
@Resource
|
||||
private MaterialProductService materialProductService;
|
||||
|
||||
@PostMapping("/saveData")
|
||||
@Operation(summary = "保存数据")
|
||||
public CommonResult<MaterialProductRespVO> saveData(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) {
|
||||
return materialProductService.saveData(createReqVO);
|
||||
}
|
||||
|
||||
@PostMapping("/saveClassify")
|
||||
@PostMapping("/save-category")
|
||||
@Operation(summary = "保存分类")
|
||||
public CommonResult<MaterialProductRespVO> saveClassify(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) {
|
||||
return materialProductService.saveCategory(createReqVO);
|
||||
// @PreAuthorize("@ss.hasPermission('qms:material-product:create-category')")
|
||||
public CommonResult<MaterialProductRespVO> saveMaterialCategory(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) {
|
||||
return success(materialProductService.saveMaterialCategory(createReqVO));
|
||||
}
|
||||
|
||||
@GetMapping("/getTreeData")
|
||||
@Operation(summary = "查询分类树")
|
||||
public CommonResult<List<MaterialProductRespVO>> getTreeData() {
|
||||
List<MaterialProductDO> list = materialProductService.getTreeData(DataTypeConstant.DATA_TYPE_CATEGORY);
|
||||
return success(BeanUtils.toBean(list, MaterialProductRespVO.class));
|
||||
@GetMapping("/category-tree")
|
||||
@Operation(summary = "获取分类树")
|
||||
public CommonResult<List<MaterialProductRespVO>> getMaterialCategoryTree() {
|
||||
return success(materialProductService.getMaterialCategoryTree());
|
||||
}
|
||||
|
||||
@GetMapping("/getProductTreeData")
|
||||
@Operation(summary = "获取分类和产品树")
|
||||
public CommonResult<List<MaterialProductRespVO>> getProductTreeData() {
|
||||
List<MaterialProductDO> list = materialProductService.getTreeData("");
|
||||
return success(BeanUtils.toBean(list, MaterialProductRespVO.class));
|
||||
@GetMapping("/orig-material/{code}")
|
||||
@Operation(summary = "根据物料编码获取外部系统原始物料")
|
||||
public CommonResult<Object> getOriginalMaterial(@PathVariable String code) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建物料大类")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:create')")
|
||||
public CommonResult<MaterialProductRespVO> createMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) {
|
||||
return success(materialProductService.createMaterialProduct(createReqVO));
|
||||
|
||||
@PostMapping("/save-material")
|
||||
@Operation(summary = "保存物料大类")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:material-product:create')")
|
||||
public CommonResult<MaterialProductRespVO> saveMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) {
|
||||
return success(materialProductService.saveMaterialProduct(createReqVO));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料大类分页")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:material-product:query')")
|
||||
public CommonResult<PageResult<MaterialProductRespVO>> getMaterialProductPage(@Valid MaterialProductPageReqVO pageReqVO) {
|
||||
PageResult<MaterialProductDO> pageResult = materialProductService.getMaterialProductPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialProductRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新物料大类")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:update')")
|
||||
@Operation(summary = "更新物料")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-product:update')")
|
||||
public CommonResult<Boolean> updateMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO updateReqVO) {
|
||||
materialProductService.updateMaterialProduct(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除物料大类")
|
||||
@Operation(summary = "删除物料")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:delete')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-product:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialProduct(@RequestParam("id") Long id) {
|
||||
materialProductService.deleteMaterialProduct(id);
|
||||
return success(true);
|
||||
@@ -104,33 +103,25 @@ public class MaterialProductController extends AbstractFileUploadController impl
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除物料大类")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:delete')")
|
||||
@Operation(summary = "批量删除物料")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-product:delete')")
|
||||
public CommonResult<Boolean> deleteMaterialProductList(@RequestBody BatchDeleteReqVO req) {
|
||||
materialProductService.deleteMaterialProductListByIds(req.getIds());
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得物料大类")
|
||||
@Operation(summary = "获得物料")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:query')")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-product:query')")
|
||||
public CommonResult<MaterialProductRespVO> getMaterialProduct(@RequestParam("id") Long id) {
|
||||
MaterialProductDO materialProduct = materialProductService.getMaterialProduct(id);
|
||||
return success(BeanUtils.toBean(materialProduct, MaterialProductRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得物料大类分页")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:query')")
|
||||
public CommonResult<PageResult<MaterialProductRespVO>> getMaterialProductPage(@Valid MaterialProductPageReqVO pageReqVO) {
|
||||
PageResult<MaterialProductDO> pageResult = materialProductService.getMaterialProductPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MaterialProductRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出物料大类 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('resource:material-product:export')")
|
||||
@Operation(summary = "导出物料 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('qms:material-product:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMaterialProductExcel(@Valid MaterialProductPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
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;
|
||||
|
||||
@Schema(description = "实例ID")
|
||||
private String materialInfomationId;
|
||||
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
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;
|
||||
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
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",requiredMode = Schema.RequiredMode.REQUIRED, example = "23099")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "产品id", example = "10774")
|
||||
private String productId;
|
||||
|
||||
@Schema(description = "库房ID",requiredMode = Schema.RequiredMode.REQUIRED, 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;
|
||||
|
||||
}
|
||||
@@ -4,6 +4,8 @@ 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.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
@@ -12,7 +14,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
|
||||
@Data
|
||||
public class MaterialBatchPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "产品id", example = "16851")
|
||||
@Schema(description = "物料大类id", example = "9381")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次编号")
|
||||
@@ -24,20 +26,29 @@ public class MaterialBatchPageReqVO extends PageParam {
|
||||
@Schema(description = "存放位置描述")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "供应商id", example = "6956")
|
||||
@Schema(description = "供应商id", example = "3737")
|
||||
private Long supplierId;
|
||||
|
||||
@Schema(description = "生产日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] manufacturerDate;
|
||||
private LocalDate[] manufacturerDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] dueDate;
|
||||
private LocalDate[] dueDate;
|
||||
|
||||
@Schema(description = "验收状态", example = "1")
|
||||
private String acceptanceStatus;
|
||||
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2")
|
||||
private String assayStatus;
|
||||
|
||||
@Schema(description = "检化验结果")
|
||||
private String assayResult;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
|
||||
@@ -2,7 +2,9 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@@ -11,12 +13,12 @@ import com.alibaba.excel.annotation.*;
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialBatchRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25470")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9716")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "产品id", example = "16851")
|
||||
@ExcelProperty("产品id")
|
||||
@Schema(description = "物料大类id", example = "9381")
|
||||
@ExcelProperty("物料大类id")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次编号")
|
||||
@@ -31,22 +33,34 @@ public class MaterialBatchRespVO {
|
||||
@ExcelProperty("存放位置描述")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "供应商id", example = "6956")
|
||||
@Schema(description = "供应商id", example = "3737")
|
||||
@ExcelProperty("供应商id")
|
||||
private Long supplierId;
|
||||
|
||||
@Schema(description = "生产日期")
|
||||
@ExcelProperty("生产日期")
|
||||
private LocalDateTime manufacturerDate;
|
||||
private LocalDate manufacturerDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
@ExcelProperty("到期日期")
|
||||
private LocalDateTime dueDate;
|
||||
private LocalDate dueDate;
|
||||
|
||||
@Schema(description = "验收状态", example = "1")
|
||||
@ExcelProperty("验收状态")
|
||||
private String acceptanceStatus;
|
||||
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
@ExcelProperty("是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2")
|
||||
@ExcelProperty("检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过")
|
||||
private String assayStatus;
|
||||
|
||||
@Schema(description = "检化验结果")
|
||||
@ExcelProperty("检化验结果")
|
||||
private String assayResult;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@@ -2,17 +2,18 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Schema(description = "管理后台 - 物料批次新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialBatchSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25470")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9716")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "产品id", example = "16851")
|
||||
@Schema(description = "物料大类id", example = "9381")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次编号")
|
||||
@@ -24,18 +25,27 @@ public class MaterialBatchSaveReqVO {
|
||||
@Schema(description = "存放位置描述")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "供应商id", example = "6956")
|
||||
@Schema(description = "供应商id", example = "3737")
|
||||
private Long supplierId;
|
||||
|
||||
@Schema(description = "生产日期")
|
||||
private LocalDateTime manufacturerDate;
|
||||
private LocalDate manufacturerDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
private LocalDateTime dueDate;
|
||||
private LocalDate dueDate;
|
||||
|
||||
@Schema(description = "验收状态", example = "1")
|
||||
private String acceptanceStatus;
|
||||
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2")
|
||||
private String assayStatus;
|
||||
|
||||
@Schema(description = "检化验结果")
|
||||
private String assayResult;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import lombok.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@@ -14,13 +14,13 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
|
||||
@Data
|
||||
public class MaterialInfomationPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "物料大类id", example = "23383")
|
||||
@Schema(description = "物料大类id", example = "2691")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次id", example = "30468")
|
||||
@Schema(description = "批次id", example = "2703")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "存放位置", example = "10632")
|
||||
@Schema(description = "存放位置", example = "13603")
|
||||
private String locationId;
|
||||
|
||||
@Schema(description = "编码")
|
||||
@@ -29,34 +29,40 @@ public class MaterialInfomationPageReqVO extends PageParam {
|
||||
@Schema(description = "技术参数")
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "负责人id", example = "10411")
|
||||
@Schema(description = "上架状态,0-未上架，1-已上架", example = "2")
|
||||
private Integer publishStatus;
|
||||
|
||||
@Schema(description = "领用状态,0-未领用，1-已领用", example = "1")
|
||||
private Integer usageStatus;
|
||||
|
||||
@Schema(description = "所属部门ID", example = "16158")
|
||||
private Integer managerDepartmentId;
|
||||
|
||||
@Schema(description = "领用人部门", example = "王五")
|
||||
private String managerDepartmentName;
|
||||
|
||||
@Schema(description = "负责人id", example = "7209")
|
||||
private Long managerUserId;
|
||||
|
||||
@Schema(description = "负责人", example = "张三")
|
||||
private String managerUserName;
|
||||
|
||||
@Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2")
|
||||
private String publishStatus;
|
||||
@Schema(description = "开封状态,0-未开封，1-已开封", example = "2")
|
||||
private Integer openStatus;
|
||||
|
||||
@Schema(description = "领用状态", example = "1")
|
||||
private String usageStatus;
|
||||
|
||||
@Schema(description = "开封状态", example = "1")
|
||||
private String openStatus;
|
||||
|
||||
@Schema(description = "开封人", example = "李四")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封人id", example = "3244")
|
||||
@Schema(description = "开封人id", example = "8280")
|
||||
private Long openUserId;
|
||||
|
||||
@Schema(description = "开封人", example = "王五")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] openDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] expirationDate;
|
||||
private LocalDate[] expirationDate;
|
||||
|
||||
@Schema(description = "过期状态")
|
||||
private String expirationFlag;
|
||||
@@ -64,6 +70,9 @@ public class MaterialInfomationPageReqVO extends PageParam {
|
||||
@Schema(description = "剩余量")
|
||||
private String remainingVolume;
|
||||
|
||||
@Schema(description = "用完标记,0-未标记，1-已用完标记")
|
||||
private Integer useEndFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@@ -74,12 +83,4 @@ public class MaterialInfomationPageReqVO extends PageParam {
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
//===================扩展属性==============
|
||||
@Schema(description = "大类ids")
|
||||
List<Long> productIds;
|
||||
|
||||
@Schema(description = "入库id")
|
||||
private Long inventoryInboundId;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,31 +1,31 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 物料实例 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialInfomationRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25067")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13447")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "物料大类id", example = "23383")
|
||||
@Schema(description = "物料大类id", example = "2691")
|
||||
@ExcelProperty("物料大类id")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次id", example = "30468")
|
||||
@Schema(description = "批次id", example = "2703")
|
||||
@ExcelProperty("批次id")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "存放位置", example = "10632")
|
||||
@Schema(description = "存放位置", example = "13603")
|
||||
@ExcelProperty("存放位置")
|
||||
private String locationId;
|
||||
|
||||
@@ -37,7 +37,23 @@ public class MaterialInfomationRespVO {
|
||||
@ExcelProperty("技术参数")
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "负责人id", example = "10411")
|
||||
@Schema(description = "上架状态,0-未上架，1-已上架", example = "2")
|
||||
@ExcelProperty("上架状态,0-未上架，1-已上架")
|
||||
private Integer publishStatus;
|
||||
|
||||
@Schema(description = "领用状态,0-未领用，1-已领用", example = "1")
|
||||
@ExcelProperty("领用状态,0-未领用，1-已领用")
|
||||
private Integer usageStatus;
|
||||
|
||||
@Schema(description = "所属部门ID", example = "16158")
|
||||
@ExcelProperty("所属部门ID")
|
||||
private Integer managerDepartmentId;
|
||||
|
||||
@Schema(description = "领用人部门", example = "王五")
|
||||
@ExcelProperty("领用人部门")
|
||||
private String managerDepartmentName;
|
||||
|
||||
@Schema(description = "负责人id", example = "7209")
|
||||
@ExcelProperty("负责人id")
|
||||
private Long managerUserId;
|
||||
|
||||
@@ -45,46 +61,38 @@ public class MaterialInfomationRespVO {
|
||||
@ExcelProperty("负责人")
|
||||
private String managerUserName;
|
||||
|
||||
@Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2")
|
||||
@ExcelProperty("上架状态,0-未上架；1-已上架，默认0")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String publishStatus;
|
||||
@Schema(description = "开封状态,0-未开封，1-已开封", example = "2")
|
||||
@ExcelProperty("开封状态,0-未开封，1-已开封")
|
||||
private Integer openStatus;
|
||||
|
||||
@Schema(description = "领用状态", example = "1")
|
||||
@ExcelProperty("领用状态")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String usageStatus;
|
||||
|
||||
@Schema(description = "开封状态", example = "1")
|
||||
@ExcelProperty("开封状态")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String openStatus;
|
||||
|
||||
@Schema(description = "开封人", example = "李四")
|
||||
@ExcelProperty("开封人")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封人id", example = "3244")
|
||||
@Schema(description = "开封人id", example = "8280")
|
||||
@ExcelProperty("开封人id")
|
||||
private Long openUserId;
|
||||
|
||||
@Schema(description = "开封人", example = "王五")
|
||||
@ExcelProperty("开封人")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封日期")
|
||||
@ExcelProperty("开封日期")
|
||||
private LocalDateTime openDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
@ExcelProperty("到期日期")
|
||||
private LocalDateTime expirationDate;
|
||||
private LocalDate expirationDate;
|
||||
|
||||
@Schema(description = "过期状态")
|
||||
@ExcelProperty("过期状态")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String expirationFlag;
|
||||
|
||||
@Schema(description = "剩余量")
|
||||
@ExcelProperty("剩余量")
|
||||
private String remainingVolume;
|
||||
|
||||
@Schema(description = "用完标记,0-未标记，1-已用完标记")
|
||||
@ExcelProperty("用完标记,0-未标记，1-已用完标记")
|
||||
private Integer useEndFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@@ -1,24 +1,27 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 物料实例新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInfomationSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25067")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13447")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "物料大类id", example = "23383")
|
||||
@Schema(description = "物料大类id", example = "2691")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "批次id", example = "30468")
|
||||
@Schema(description = "批次id", example = "2703")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "存放位置", example = "10632")
|
||||
@Schema(description = "存放位置", example = "13603")
|
||||
private String locationId;
|
||||
|
||||
@Schema(description = "编码")
|
||||
@@ -27,32 +30,38 @@ public class MaterialInfomationSaveReqVO {
|
||||
@Schema(description = "技术参数")
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "负责人id", example = "10411")
|
||||
@Schema(description = "上架状态,0-未上架，1-已上架", example = "2")
|
||||
private Integer publishStatus;
|
||||
|
||||
@Schema(description = "领用状态,0-未领用，1-已领用", example = "1")
|
||||
private Integer usageStatus;
|
||||
|
||||
@Schema(description = "所属部门ID", example = "16158")
|
||||
private Integer managerDepartmentId;
|
||||
|
||||
@Schema(description = "领用人部门", example = "王五")
|
||||
private String managerDepartmentName;
|
||||
|
||||
@Schema(description = "负责人id", example = "7209")
|
||||
private Long managerUserId;
|
||||
|
||||
@Schema(description = "负责人", example = "张三")
|
||||
private String managerUserName;
|
||||
|
||||
@Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2")
|
||||
private String publishStatus;
|
||||
@Schema(description = "开封状态,0-未开封，1-已开封", example = "2")
|
||||
private Integer openStatus;
|
||||
|
||||
@Schema(description = "领用状态", example = "1")
|
||||
private String usageStatus;
|
||||
|
||||
@Schema(description = "开封状态", example = "1")
|
||||
private String openStatus;
|
||||
|
||||
@Schema(description = "开封人", example = "李四")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封人id", example = "3244")
|
||||
@Schema(description = "开封人id", example = "8280")
|
||||
private Long openUserId;
|
||||
|
||||
@Schema(description = "开封人", example = "王五")
|
||||
private String openUserName;
|
||||
|
||||
@Schema(description = "开封日期")
|
||||
private LocalDateTime openDate;
|
||||
|
||||
@Schema(description = "到期日期")
|
||||
private LocalDateTime expirationDate;
|
||||
private LocalDate expirationDate;
|
||||
|
||||
@Schema(description = "过期状态")
|
||||
private String expirationFlag;
|
||||
@@ -60,6 +69,9 @@ public class MaterialInfomationSaveReqVO {
|
||||
@Schema(description = "剩余量")
|
||||
private String remainingVolume;
|
||||
|
||||
@Schema(description = "用完标记,0-未标记，1-已用完标记")
|
||||
private Integer useEndFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
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 MaterialInventoryCheckBatchPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "父id", example = "9310")
|
||||
private Long checkId;
|
||||
|
||||
@Schema(description = "盘点物料大类ID", example = "18437")
|
||||
private Long checkProductId;
|
||||
|
||||
@Schema(description = "盘点部门ID", example = "17789")
|
||||
private Long checkDepartmentId;
|
||||
|
||||
@Schema(description = "应有量")
|
||||
private String expected;
|
||||
|
||||
@Schema(description = "实有量")
|
||||
private String actual;
|
||||
|
||||
@Schema(description = "差异")
|
||||
private String difference;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 库存盘点项 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialInventoryCheckBatchRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12065")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "9310")
|
||||
@ExcelProperty("父id")
|
||||
private Long checkId;
|
||||
|
||||
@Schema(description = "盘点物料大类ID", example = "18437")
|
||||
@ExcelProperty("盘点物料大类ID")
|
||||
private Long checkProductId;
|
||||
|
||||
@Schema(description = "盘点部门ID", example = "17789")
|
||||
@ExcelProperty("盘点部门ID")
|
||||
private Long checkDepartmentId;
|
||||
|
||||
@Schema(description = "应有量")
|
||||
@ExcelProperty("应有量")
|
||||
private String expected;
|
||||
|
||||
@Schema(description = "实有量")
|
||||
@ExcelProperty("实有量")
|
||||
private String actual;
|
||||
|
||||
@Schema(description = "差异")
|
||||
@ExcelProperty("差异")
|
||||
private String difference;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 库存盘点项新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInventoryCheckBatchSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12065")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "9310")
|
||||
private Long checkId;
|
||||
|
||||
@Schema(description = "盘点物料大类ID", example = "18437")
|
||||
private Long checkProductId;
|
||||
|
||||
@Schema(description = "盘点部门ID", example = "17789")
|
||||
private Long checkDepartmentId;
|
||||
|
||||
@Schema(description = "应有量")
|
||||
private String expected;
|
||||
|
||||
@Schema(description = "实有量")
|
||||
private String actual;
|
||||
|
||||
@Schema(description = "差异")
|
||||
private String difference;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "盘点明细")
|
||||
private List<MaterialInventoryCheckDetailSaveReqVO> detailList;
|
||||
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
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 MaterialInventoryCheckDetailPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "盘点批次id", example = "12013")
|
||||
private Long checkBatchId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "2480")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "是否存在")
|
||||
private String present;
|
||||
|
||||
@Schema(description = "当前数量")
|
||||
private String currentQuantity;
|
||||
|
||||
@Schema(description = "状态", example = "1")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "处置方式,字典配置")
|
||||
private String disposalMethod;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
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 MaterialInventoryCheckDetailRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16347")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "盘点批次id", example = "12013")
|
||||
@ExcelProperty("盘点批次id")
|
||||
private Long checkBatchId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "2480")
|
||||
@ExcelProperty("物料实例id")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "是否存在")
|
||||
@ExcelProperty("是否存在")
|
||||
private String present;
|
||||
|
||||
@Schema(description = "当前数量")
|
||||
@ExcelProperty("当前数量")
|
||||
private String currentQuantity;
|
||||
|
||||
@Schema(description = "状态", example = "1")
|
||||
@ExcelProperty("状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "处置方式,字典配置")
|
||||
@ExcelProperty("处置方式,字典配置")
|
||||
private String disposalMethod;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
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 MaterialInventoryCheckDetailSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16347")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "盘点批次id", example = "12013")
|
||||
private Long checkBatchId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "2480")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "是否存在")
|
||||
private String present;
|
||||
|
||||
@Schema(description = "当前数量")
|
||||
private String currentQuantity;
|
||||
|
||||
@Schema(description = "状态", example = "1")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "处置方式,字典配置")
|
||||
private String disposalMethod;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
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 MaterialInventoryCheckPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "31128")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "16511")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "6407")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
@Schema(description = "主键")
|
||||
private Long id;
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 库存盘点 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialInventoryCheckRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2275")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
@ExcelProperty("标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型", example = "2")
|
||||
@ExcelProperty("业务类型")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
@ExcelProperty("业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
@ExcelProperty("申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "31128")
|
||||
@ExcelProperty("申请人id")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
@ExcelProperty("申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "16511")
|
||||
@ExcelProperty("申请部门id")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@ExcelProperty("申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "6407")
|
||||
@ExcelProperty("流程实例id")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
@ExcelProperty("流程审批状态")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "盘点项")
|
||||
@ExcelProperty("盘点项")
|
||||
private List<MaterialInventoryCheckBatchRespVO> batchList;
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 库存盘点新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInventoryCheckSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2275")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "31128")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "16511")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "6407")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "盘点项")
|
||||
private List<MaterialInventoryCheckBatchSaveReqVO> batchList;
|
||||
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
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 MaterialInventoryInboundDetailPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "入库单ID", example = "8031")
|
||||
private Long inboundId;
|
||||
|
||||
@Schema(description = "分发批次id", example = "24731")
|
||||
private Long batchAssignId;
|
||||
|
||||
@Schema(description = "入库方式")
|
||||
private String inboundWay;
|
||||
|
||||
@Schema(description = "物料实例ID", example = "23510")
|
||||
private Long materialInfomationId;
|
||||
|
||||
@Schema(description = "入库人", example = "赵六")
|
||||
private String inboundUserName;
|
||||
|
||||
@Schema(description = "入库人id", example = "8857")
|
||||
private Long inboundUserId;
|
||||
|
||||
@Schema(description = "入库人部门", example = "芋艿")
|
||||
private String inboundDepartmentName;
|
||||
|
||||
@Schema(description = "入库人部门id", example = "8008")
|
||||
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;
|
||||
|
||||
@Schema(description = "物料大类Id")
|
||||
private Long productId;
|
||||
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
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 MaterialInventoryInboundDetailRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20724")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "入库单ID", example = "8031")
|
||||
@ExcelProperty("入库单ID")
|
||||
private Long inboundId;
|
||||
|
||||
@Schema(description = "分发批次id", example = "24731")
|
||||
@ExcelProperty("分发批次id")
|
||||
private Long batchAssignId;
|
||||
|
||||
@Schema(description = "入库方式")
|
||||
@ExcelProperty("入库方式")
|
||||
private String inboundWay;
|
||||
|
||||
@Schema(description = "物料实例ID", example = "23510")
|
||||
@ExcelProperty("物料实例ID")
|
||||
private Long materialInfomationId;
|
||||
|
||||
@Schema(description = "入库人", example = "赵六")
|
||||
@ExcelProperty("入库人")
|
||||
private String inboundUserName;
|
||||
|
||||
@Schema(description = "入库人id", example = "8857")
|
||||
@ExcelProperty("入库人id")
|
||||
private Long inboundUserId;
|
||||
|
||||
@Schema(description = "入库人部门", example = "芋艿")
|
||||
@ExcelProperty("入库人部门")
|
||||
private String inboundDepartmentName;
|
||||
|
||||
@Schema(description = "入库人部门id", example = "8008")
|
||||
@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;
|
||||
|
||||
private Long productId;
|
||||
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
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 lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInventoryInboundDetailSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20724")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "入库单ID", example = "8031")
|
||||
private Long inboundId;
|
||||
|
||||
@Schema(description = "分发批次id", example = "24731")
|
||||
private Long batchAssignId;
|
||||
|
||||
@Schema(description = "入库方式")
|
||||
private String inboundWay;
|
||||
|
||||
@Schema(description = "物料实例ID", example = "23510")
|
||||
private Long materialInfomationId;
|
||||
|
||||
@Schema(description = "入库人", example = "赵六")
|
||||
private String inboundUserName;
|
||||
|
||||
@Schema(description = "入库人id", example = "8857")
|
||||
private Long inboundUserId;
|
||||
|
||||
@Schema(description = "入库人部门", example = "芋艿")
|
||||
private String inboundDepartmentName;
|
||||
|
||||
@Schema(description = "入库人部门id", example = "8008")
|
||||
private Long inboundDepartmentId;
|
||||
|
||||
@Schema(description = "入库时间")
|
||||
private LocalDateTime inboundTime;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "申请数量")
|
||||
private Long quantity;
|
||||
|
||||
/**
|
||||
* 存放位置
|
||||
*/
|
||||
@TableField("LOC_ID")
|
||||
private String locationId;
|
||||
|
||||
/**
|
||||
* 物料大类id
|
||||
*/
|
||||
@TableField("PDT_ID")
|
||||
private Long productId;
|
||||
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
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 MaterialInventoryInboundPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "30960")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "666")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "654")
|
||||
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;
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
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 MaterialInventoryInboundRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15437")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
@ExcelProperty("标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
@ExcelProperty("业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
@ExcelProperty("业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
@ExcelProperty("申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "30960")
|
||||
@ExcelProperty("申请人id")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
@ExcelProperty("申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "666")
|
||||
@ExcelProperty("申请部门id")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@ExcelProperty("申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "654")
|
||||
@ExcelProperty("流程实例id")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "1")
|
||||
@ExcelProperty("流程审批状态")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "意见json")
|
||||
@ExcelProperty("意见json")
|
||||
private String commentJson;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
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 lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 入库新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInventoryInboundSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15437")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "30960")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "666")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "流程实例id", example = "654")
|
||||
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 = "详情",requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private MaterialInventoryInboundDetailSaveReqVO detail;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
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 MaterialInventoryOutboundDetailPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "出库单id", example = "21793")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "13656")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "数量")
|
||||
private String quantity;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
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 MaterialInventoryOutboundDetailRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20579")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "出库单id", example = "21793")
|
||||
@ExcelProperty("出库单id")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "13656")
|
||||
@ExcelProperty("物料实例id")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "数量")
|
||||
@ExcelProperty("数量")
|
||||
private String quantity;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
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 MaterialInventoryOutboundDetailSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20579")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "出库单id", example = "21793")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "物料实例id", example = "13656")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "数量")
|
||||
private String quantity;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
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 MaterialInventoryOutboundPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "22585")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "22046")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] applyTime;
|
||||
|
||||
@Schema(description = "监督人")
|
||||
private String checkUser;
|
||||
|
||||
@Schema(description = "监督人id", example = "30131")
|
||||
private Long checkUserId;
|
||||
|
||||
@Schema(description = "流程实例id", example = "4828")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "意见json")
|
||||
private String commentJson;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "1")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
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 java.util.List;
|
||||
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 出库 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialInventoryOutboundRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28833")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
@ExcelProperty("标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
@ExcelProperty("业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
@ExcelProperty("业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
@ExcelProperty("申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "22585")
|
||||
@ExcelProperty("申请人id")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
@ExcelProperty("申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "22046")
|
||||
@ExcelProperty("申请部门id")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@ExcelProperty("申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "监督人")
|
||||
@ExcelProperty("监督人")
|
||||
private String checkUser;
|
||||
|
||||
@Schema(description = "监督人id", example = "30131")
|
||||
@ExcelProperty("监督人id")
|
||||
private Long checkUserId;
|
||||
|
||||
@Schema(description = "流程实例id", example = "4828")
|
||||
@ExcelProperty("流程实例id")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "意见json")
|
||||
@ExcelProperty("意见json")
|
||||
private String commentJson;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "1")
|
||||
@ExcelProperty("流程审批状态")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "出库明细")
|
||||
private List<MaterialInventoryOutboundDetailRespVO> detailReqVoList;
|
||||
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
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 java.util.List;
|
||||
|
||||
@Schema(description = "管理后台 - 出库新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialInventoryOutboundSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28833")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "22585")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "22046")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "监督人")
|
||||
private String checkUser;
|
||||
|
||||
@Schema(description = "监督人id", example = "30131")
|
||||
private Long checkUserId;
|
||||
|
||||
@Schema(description = "流程实例id", example = "4828")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "意见json")
|
||||
private String commentJson;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "1")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
@Schema(description = "出库明细")
|
||||
private List<MaterialInventoryOutboundDetailSaveReqVO> detailSaveReqVoList;
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
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 MaterialInventoryPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.AUTO, example = "32133")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "6098")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "id路径")
|
||||
private String idPath;
|
||||
|
||||
@Schema(description = "节点类型,分类|产品", example = "2")
|
||||
private String nodeType;
|
||||
|
||||
@Schema(description = "名称", example = "张三")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "其他配置")
|
||||
private String customConfig;
|
||||
|
||||
@Schema(description = "自定义表单")
|
||||
private String customForm;
|
||||
|
||||
@Schema(description = "扩展数据")
|
||||
private String customData;
|
||||
|
||||
@Schema(description = "标签")
|
||||
private String tag;
|
||||
|
||||
@Schema(description = "标签模板")
|
||||
private String labelTemplateKey;
|
||||
|
||||
@Schema(description = "型号")
|
||||
private String modelNo;
|
||||
|
||||
@Schema(description = "规格")
|
||||
private String specification;
|
||||
|
||||
@Schema(description = "技术参数")
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "制造商")
|
||||
private String manufacturer;
|
||||
|
||||
@Schema(description = "单位")
|
||||
private String unit;
|
||||
|
||||
@Schema(description = "允许按量领取")
|
||||
private String enablePartial;
|
||||
|
||||
@Schema(description = "保质期（天）")
|
||||
private Integer due;
|
||||
|
||||
@Schema(description = "开封后保质期是否变化")
|
||||
private String openDueFlag;
|
||||
|
||||
@Schema(description = "开封后保质期（天）")
|
||||
private Integer openDueAfter;
|
||||
|
||||
@Schema(description = "是否危险品")
|
||||
private String hazardous;
|
||||
|
||||
@Schema(description = "是否标准溶液")
|
||||
private String standardSolutionFlag;
|
||||
|
||||
@Schema(description = "是否标准物质")
|
||||
private String standardMaterialFlag;
|
||||
|
||||
@Schema(description = "复标周期,单位：天。小于等于0-不复标")
|
||||
private Integer reviewDue;
|
||||
|
||||
@Schema(description = "排序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "禁用")
|
||||
private String cancelFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,143 +0,0 @@
|
||||
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.framework.common.pojo.PageParam;
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 库存列表 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialInventoryRespVO extends PageParam {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "6098")
|
||||
@ExcelProperty("父id")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "id路径")
|
||||
@ExcelProperty("id路径")
|
||||
private String idPath;
|
||||
|
||||
@Schema(description = "节点类型,分类|产品", example = "2")
|
||||
@ExcelProperty("节点类型,分类|产品")
|
||||
private String nodeType;
|
||||
|
||||
@Schema(description = "名称", example = "张三")
|
||||
@ExcelProperty("名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "其他配置")
|
||||
@ExcelProperty("其他配置")
|
||||
private String customConfig;
|
||||
|
||||
@Schema(description = "自定义表单")
|
||||
@ExcelProperty("自定义表单")
|
||||
private String customForm;
|
||||
|
||||
@Schema(description = "扩展数据")
|
||||
@ExcelProperty("扩展数据")
|
||||
private String customData;
|
||||
|
||||
@Schema(description = "标签")
|
||||
@ExcelProperty("标签")
|
||||
private String tag;
|
||||
|
||||
@Schema(description = "标签模板")
|
||||
@ExcelProperty("标签模板")
|
||||
private String labelTemplateKey;
|
||||
|
||||
@Schema(description = "型号")
|
||||
@ExcelProperty("型号")
|
||||
private String modelNo;
|
||||
|
||||
@Schema(description = "规格")
|
||||
@ExcelProperty("规格")
|
||||
private String specification;
|
||||
|
||||
@Schema(description = "技术参数")
|
||||
@ExcelProperty("技术参数")
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "制造商")
|
||||
@ExcelProperty("制造商")
|
||||
private String manufacturer;
|
||||
|
||||
@Schema(description = "单位")
|
||||
@ExcelProperty("单位")
|
||||
private String unit;
|
||||
|
||||
@Schema(description = "允许按量领取")
|
||||
@ExcelProperty("允许按量领取")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String enablePartial;
|
||||
|
||||
@Schema(description = "保质期（天）")
|
||||
@ExcelProperty("保质期（天）")
|
||||
private Integer due;
|
||||
|
||||
@Schema(description = "开封后保质期是否变化")
|
||||
@ExcelProperty("开封后保质期是否变化")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String openDueFlag;
|
||||
|
||||
@Schema(description = "开封后保质期（天）")
|
||||
@ExcelProperty("开封后保质期（天）")
|
||||
private Integer openDueAfter;
|
||||
|
||||
@Schema(description = "是否危险品")
|
||||
@ExcelProperty("是否危险品")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String hazardous;
|
||||
|
||||
@Schema(description = "是否标准溶液")
|
||||
@ExcelProperty("是否标准溶液")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String standardSolutionFlag;
|
||||
|
||||
@Schema(description = "是否标准物质")
|
||||
@ExcelProperty("是否标准物质")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String standardMaterialFlag;
|
||||
|
||||
@Schema(description = "复标周期,单位：天。小于等于0-不复标")
|
||||
@ExcelProperty("复标周期")
|
||||
private Integer reviewDue;
|
||||
|
||||
@Schema(description = "排序号")
|
||||
@ExcelProperty("排序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "禁用")
|
||||
@ExcelProperty("禁用")
|
||||
private String cancelFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 总数量
|
||||
*/
|
||||
@TableField("INB_QTY")
|
||||
@Schema(description = "库存总量")
|
||||
@ExcelProperty("库存总量")
|
||||
private Long inboundQuantity;
|
||||
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
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 MaterialLifecycleDetailPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "父ID", example = "24095")
|
||||
private Long materialLifecycleId;
|
||||
|
||||
@Schema(description = "物料批次编号", example = "30393")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "物料大类编号", example = "1020")
|
||||
private String categoryProductId;
|
||||
|
||||
@Schema(description = "物料实例编号", example = "11872")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "影响数量", example = "28166")
|
||||
private String influenceCount;
|
||||
|
||||
@Schema(description = "明细操作类型", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "处理状态", example = "1")
|
||||
private Integer treatmentStatus;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "公司名称", example = "赵六")
|
||||
private String companyName;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
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 MaterialLifecycleDetailRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父ID", example = "24095")
|
||||
@ExcelProperty("父ID")
|
||||
private Long materialLifecycleId;
|
||||
|
||||
@Schema(description = "物料批次编号", example = "30393")
|
||||
@ExcelProperty("物料批次编号")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "物料大类编号", example = "1020")
|
||||
@ExcelProperty("物料大类编号")
|
||||
private String categoryProductId;
|
||||
|
||||
@Schema(description = "物料实例编号", example = "11872")
|
||||
@ExcelProperty("物料实例编号")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "影响数量", example = "28166")
|
||||
@ExcelProperty("影响数量")
|
||||
private String influenceCount;
|
||||
|
||||
@Schema(description = "明细操作类型", example = "2")
|
||||
@ExcelProperty("明细操作类型")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "处理状态", example = "1")
|
||||
@ExcelProperty("处理状态")
|
||||
private Integer treatmentStatus;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
@ExcelProperty("表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "公司编号", example = "2613")
|
||||
@ExcelProperty("公司编号")
|
||||
private Long companyId;
|
||||
|
||||
@Schema(description = "公司名称", example = "赵六")
|
||||
@ExcelProperty("公司名称")
|
||||
private String companyName;
|
||||
|
||||
@Schema(description = "部门编号", example = "32413")
|
||||
@ExcelProperty("部门编号")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
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 MaterialLifecycleDetailSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父ID", example = "24095")
|
||||
private Long materialLifecycleId;
|
||||
|
||||
@Schema(description = "物料批次编号", example = "30393")
|
||||
private Long batchId;
|
||||
|
||||
@Schema(description = "物料大类编号", example = "1020")
|
||||
private String categoryProductId;
|
||||
|
||||
@Schema(description = "物料实例编号", example = "11872")
|
||||
private Long infomationId;
|
||||
|
||||
@Schema(description = "影响数量", example = "28166")
|
||||
private String influenceCount;
|
||||
|
||||
@Schema(description = "明细操作类型", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "处理状态", example = "1")
|
||||
private Integer treatmentStatus;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "公司编号", example = "2613")
|
||||
private Long companyId;
|
||||
|
||||
@Schema(description = "公司名称", example = "赵六")
|
||||
private String companyName;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
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 MaterialLifecyclePageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "29846")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "7174")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] applyTime;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "流程实例id", example = "28688")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
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 MaterialLifecycleRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
@ExcelProperty("标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
|
||||
@ExcelProperty("业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
@ExcelProperty("业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
@ExcelProperty("申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "29846")
|
||||
@ExcelProperty("申请人id")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
@ExcelProperty("申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "7174")
|
||||
@ExcelProperty("申请部门id")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
@ExcelProperty("申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
@ExcelProperty("表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "流程实例id", example = "28688")
|
||||
@ExcelProperty("流程实例id")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
@ExcelProperty("流程审批状态")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 物料通用流程新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialLifecycleSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "标题")
|
||||
private String title;
|
||||
|
||||
@Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2")
|
||||
private String businessType;
|
||||
|
||||
@Schema(description = "业务类型编码")
|
||||
private String businessTypeCode;
|
||||
|
||||
@Schema(description = "申请人")
|
||||
private String applyUser;
|
||||
|
||||
@Schema(description = "申请人id", example = "29846")
|
||||
private Long applyUserId;
|
||||
|
||||
@Schema(description = "申请部门")
|
||||
private String applyDepartment;
|
||||
|
||||
@Schema(description = "申请部门id", example = "7174")
|
||||
private Long applyDepartmentId;
|
||||
|
||||
@Schema(description = "申请时间")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
@Schema(description = "表单数据,表单数据")
|
||||
private String formData;
|
||||
|
||||
@Schema(description = "流程实例id", example = "28688")
|
||||
private String flowInstanceId;
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
@@ -12,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
|
||||
@Data
|
||||
public class MaterialLocationPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "上级id", example = "15203")
|
||||
@Schema(description = "上级id", example = "9092")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "名称", example = "赵六")
|
||||
@@ -21,12 +22,12 @@ public class MaterialLocationPageReqVO extends PageParam {
|
||||
@Schema(description = "编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "编码路径")
|
||||
private String codePath;
|
||||
|
||||
@Schema(description = "容量")
|
||||
private String capacity;
|
||||
|
||||
@Schema(description = "位置")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
|
||||
@@ -2,7 +2,8 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@@ -11,11 +12,11 @@ import com.alibaba.excel.annotation.*;
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialLocationRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7748")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32724")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "上级id", example = "15203")
|
||||
@Schema(description = "上级id", example = "9092")
|
||||
@ExcelProperty("上级id")
|
||||
private Long parentId;
|
||||
|
||||
@@ -27,14 +28,14 @@ public class MaterialLocationRespVO {
|
||||
@ExcelProperty("编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "编码路径")
|
||||
@ExcelProperty("编码路径")
|
||||
private String codePath;
|
||||
|
||||
@Schema(description = "容量")
|
||||
@ExcelProperty("容量")
|
||||
private String capacity;
|
||||
|
||||
@Schema(description = "位置")
|
||||
@ExcelProperty("位置")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@@ -2,15 +2,17 @@ package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 存放位置新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialLocationSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7748")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32724")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "上级id", example = "15203")
|
||||
@Schema(description = "上级id", example = "9092")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "名称", example = "赵六")
|
||||
@@ -19,12 +21,12 @@ public class MaterialLocationSaveReqVO {
|
||||
@Schema(description = "编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "编码路径")
|
||||
private String codePath;
|
||||
|
||||
@Schema(description = "容量")
|
||||
private String capacity;
|
||||
|
||||
@Schema(description = "位置")
|
||||
private String location;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
|
||||
@@ -13,16 +13,16 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
|
||||
@Data
|
||||
public class MaterialProductPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "父id", example = "6098")
|
||||
@Schema(description = "父id", example = "7533")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "id路径")
|
||||
private String idPath;
|
||||
|
||||
@Schema(description = "节点类型,分类|产品", example = "2")
|
||||
private String nodeType;
|
||||
@Schema(description = "编码,原始数据编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "名称", example = "张三")
|
||||
@Schema(description = "名称", example = "ZT")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "其他配置")
|
||||
@@ -55,35 +55,44 @@ public class MaterialProductPageReqVO extends PageParam {
|
||||
@Schema(description = "单位")
|
||||
private String unit;
|
||||
|
||||
@Schema(description = "允许按量领取")
|
||||
private String enablePartial;
|
||||
@Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走")
|
||||
private Integer enablePartial;
|
||||
|
||||
@Schema(description = "保质期（天）")
|
||||
private Integer due;
|
||||
private Integer[] due;
|
||||
|
||||
@Schema(description = "开封后保质期是否变化")
|
||||
private String openDueFlag;
|
||||
@Schema(description = "开封后保质期是否变化,1-是，0-否")
|
||||
private Integer openDueFlag;
|
||||
|
||||
@Schema(description = "开封后保质期（天）")
|
||||
private Integer openDueAfter;
|
||||
private Integer[] openDueAfter;
|
||||
|
||||
@Schema(description = "是否危险品")
|
||||
private String hazardous;
|
||||
@Schema(description = "是否危险品,1-是，0-否")
|
||||
private Integer hazardous;
|
||||
|
||||
@Schema(description = "是否标准溶液")
|
||||
private String standardSolutionFlag;
|
||||
@Schema(description = "是否标准溶液,1-是，0-否")
|
||||
private Integer standardSolutionFlag;
|
||||
|
||||
@Schema(description = "是否标准物质")
|
||||
private String standardMaterialFlag;
|
||||
@Schema(description = "是否标准物质,1-是，0-否")
|
||||
private Integer standardMaterialFlag;
|
||||
|
||||
@Schema(description = "复标周期,单位：天。小于等于0-不复标")
|
||||
private Integer reviewDue;
|
||||
private Integer[] reviewDue;
|
||||
|
||||
@Schema(description = "排序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "禁用")
|
||||
private String cancelFlag;
|
||||
@Schema(description = "禁用标识")
|
||||
private Integer cancelFlag;
|
||||
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "是否进行库存预警,1-是，0-否")
|
||||
private Integer InventoryAlarmFlag;
|
||||
|
||||
@Schema(description = "库存预警区间,json格式配置")
|
||||
private String InventoryAlarmRange;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
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 MaterialProductRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23369")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "6098")
|
||||
@Schema(description = "父id", example = "7533")
|
||||
@ExcelProperty("父id")
|
||||
private Long parentId;
|
||||
|
||||
@@ -25,11 +25,15 @@ public class MaterialProductRespVO {
|
||||
@ExcelProperty("id路径")
|
||||
private String idPath;
|
||||
|
||||
@Schema(description = "节点类型,分类|产品", example = "2")
|
||||
@ExcelProperty("节点类型,分类|产品")
|
||||
@Schema(description = "节点类型,分类|物料", example = "1")
|
||||
@ExcelProperty("节点类型,分类|物料")
|
||||
private String nodeType;
|
||||
|
||||
@Schema(description = "名称", example = "张三")
|
||||
@Schema(description = "编码,原始数据编码")
|
||||
@ExcelProperty("编码,原始数据编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "名称", example = "ZT")
|
||||
@ExcelProperty("名称")
|
||||
private String name;
|
||||
|
||||
@@ -73,50 +77,57 @@ public class MaterialProductRespVO {
|
||||
@ExcelProperty("单位")
|
||||
private String unit;
|
||||
|
||||
@Schema(description = "允许按量领取")
|
||||
@ExcelProperty("允许按量领取")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String enablePartial;
|
||||
@Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走")
|
||||
@ExcelProperty("允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走")
|
||||
private Integer enablePartial;
|
||||
|
||||
@Schema(description = "保质期（天）")
|
||||
@ExcelProperty("保质期（天）")
|
||||
private Integer due;
|
||||
|
||||
@Schema(description = "开封后保质期是否变化")
|
||||
@ExcelProperty("开封后保质期是否变化")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String openDueFlag;
|
||||
@Schema(description = "开封后保质期是否变化,1-是，0-否")
|
||||
@ExcelProperty("开封后保质期是否变化,1-是，0-否")
|
||||
private Integer openDueFlag;
|
||||
|
||||
@Schema(description = "开封后保质期（天）")
|
||||
@ExcelProperty("开封后保质期（天）")
|
||||
private Integer openDueAfter;
|
||||
|
||||
@Schema(description = "是否危险品")
|
||||
@ExcelProperty("是否危险品")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String hazardous;
|
||||
@Schema(description = "是否危险品,1-是，0-否")
|
||||
@ExcelProperty("是否危险品,1-是，0-否")
|
||||
private Integer hazardous;
|
||||
|
||||
@Schema(description = "是否标准溶液")
|
||||
@ExcelProperty("是否标准溶液")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String standardSolutionFlag;
|
||||
@Schema(description = "是否标准溶液,1-是，0-否")
|
||||
@ExcelProperty("是否标准溶液,1-是，0-否")
|
||||
private Integer standardSolutionFlag;
|
||||
|
||||
@Schema(description = "是否标准物质")
|
||||
@ExcelProperty("是否标准物质")
|
||||
@Dict(dicCode = "yes_or_no")
|
||||
private String standardMaterialFlag;
|
||||
@Schema(description = "是否标准物质,1-是，0-否")
|
||||
@ExcelProperty("是否标准物质,1-是，0-否")
|
||||
private Integer standardMaterialFlag;
|
||||
|
||||
@Schema(description = "复标周期,单位：天。小于等于0-不复标")
|
||||
@ExcelProperty("复标周期")
|
||||
@ExcelProperty("复标周期,单位：天。小于等于0-不复标")
|
||||
private Integer reviewDue;
|
||||
|
||||
@Schema(description = "排序号")
|
||||
@ExcelProperty("排序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "禁用")
|
||||
@ExcelProperty("禁用")
|
||||
private String cancelFlag;
|
||||
@Schema(description = "禁用标识")
|
||||
@ExcelProperty("禁用标识")
|
||||
private Integer cancelFlag;
|
||||
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
@ExcelProperty("是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "是否进行库存预警,1-是，0-否")
|
||||
@ExcelProperty("是否进行库存预警,1-是，0-否")
|
||||
private Integer InventoryAlarmFlag;
|
||||
|
||||
@Schema(description = "库存预警区间,json格式配置")
|
||||
@ExcelProperty("库存预警区间,json格式配置")
|
||||
private String InventoryAlarmRange;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
@ExcelProperty("所属部门")
|
||||
@@ -130,4 +141,7 @@ public class MaterialProductRespVO {
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "子物料分类")
|
||||
private List<MaterialProductRespVO> children;
|
||||
|
||||
}
|
||||
@@ -1,42 +1,44 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.zt.plat.module.qms.resource.material.valid.AddGroup;
|
||||
import com.zt.plat.module.qms.resource.material.valid.UpdateGroup;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Null;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "管理后台 - 物料大类新增/修改 Request VO")
|
||||
@Data
|
||||
public class MaterialProductSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133")
|
||||
@NotNull(groups = {UpdateGroup.class}, message = "更新操作 ID 不能为空")
|
||||
@Null(groups = {AddGroup.class}, message = "新增操作 ID 必须为空")
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23369")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "父id", example = "6098")
|
||||
private Long parentId;
|
||||
@Schema(description = "父id", example = "7533")
|
||||
private Long parentId = 0L;
|
||||
|
||||
@Schema(description = "id路径")
|
||||
private String idPath;
|
||||
@Schema(description = "编码,原始数据编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "节点类型,分类|产品", example = "2")
|
||||
private String nodeType;
|
||||
|
||||
@Schema(description = "名称", example = "张三")
|
||||
@Schema(description = "名称", example = "ZT")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "其他配置")
|
||||
private String customConfig;
|
||||
|
||||
@Schema(description = "自定义表单")
|
||||
@Schema(description = "自定义表单（预留的扩展字段）")
|
||||
private String customForm;
|
||||
|
||||
@Schema(description = "扩展数据")
|
||||
@Schema(description = "扩展数据（预留的扩展字段）")
|
||||
private String customData;
|
||||
|
||||
@Schema(description = "标签")
|
||||
@Schema(description = "标签（预留的扩展字段）")
|
||||
private String tag;
|
||||
|
||||
@Schema(description = "标签模板")
|
||||
private String labelTemplateKey;
|
||||
|
||||
@Schema(description = "型号")
|
||||
private String modelNo;
|
||||
|
||||
@@ -52,38 +54,47 @@ public class MaterialProductSaveReqVO {
|
||||
@Schema(description = "单位")
|
||||
private String unit;
|
||||
|
||||
@Schema(description = "允许按量领取")
|
||||
private String enablePartial;
|
||||
@Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走")
|
||||
private Integer enablePartial;
|
||||
|
||||
@Schema(description = "保质期（天）")
|
||||
@Min(value = 0, message = "保质期不能小于0")
|
||||
private Integer due;
|
||||
|
||||
@Schema(description = "开封后保质期是否变化")
|
||||
@Schema(description = "开封后保质期是否变化,1-是，0-否")
|
||||
private Integer openDueFlag;
|
||||
|
||||
@Schema(description = "开封后保质期（天）")
|
||||
@Min(value = 0, message = "保质期不能小于0")
|
||||
private Integer openDueAfter;
|
||||
|
||||
@Schema(description = "是否危险品")
|
||||
private String hazardous;
|
||||
@Schema(description = "是否危险品,1-是，0-否")
|
||||
private Integer hazardous;
|
||||
|
||||
@Schema(description = "是否标准溶液")
|
||||
private String standardSolutionFlag;
|
||||
@Schema(description = "是否标准溶液,1-是，0-否")
|
||||
private Integer standardSolutionFlag;
|
||||
|
||||
@Schema(description = "是否标准物质")
|
||||
private String standardMaterialFlag;
|
||||
@Schema(description = "是否标准物质,1-是，0-否")
|
||||
private Integer standardMaterialFlag;
|
||||
|
||||
@Schema(description = "复标周期,单位：天。小于等于0-不复标")
|
||||
@Min(value = 0, message = "复标周期不能小于0")
|
||||
private Integer reviewDue;
|
||||
|
||||
@Schema(description = "排序号")
|
||||
private Integer sortNo;
|
||||
|
||||
@Schema(description = "禁用")
|
||||
private String cancelFlag;
|
||||
@Schema(description = "禁用标识")
|
||||
private Integer cancelFlag;
|
||||
|
||||
@Schema(description = "所属部门")
|
||||
private String systemDepartmentCode;
|
||||
@Schema(description = "是否检化验,1-是，0-否")
|
||||
private Integer assayFlag;
|
||||
|
||||
@Schema(description = "是否进行库存预警,1-是，0-否")
|
||||
private Integer InventoryAlarmFlag;
|
||||
|
||||
@Schema(description = "库存预警区间,json格式配置")
|
||||
private String InventoryAlarmRange;
|
||||
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 物料批次分发 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_bat_asn")
|
||||
@KeySequence("t_mtrl_bat_asn_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialBatchAssignDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 源批次ID
|
||||
*/
|
||||
@TableField("BAT_ID")
|
||||
private Long batchId;
|
||||
/**
|
||||
* 产品id
|
||||
*/
|
||||
@TableField("PDT_ID")
|
||||
private Long productId;
|
||||
/**
|
||||
* 库房ID
|
||||
*/
|
||||
@TableField("WRH_ID")
|
||||
private Long warehouseId;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField("INB_QTY")
|
||||
private Long inboundQuantity;
|
||||
/**
|
||||
* 暂存位置记录
|
||||
*/
|
||||
@TableField("URL")
|
||||
private String url;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 物料批次 DO
|
||||
*
|
||||
@@ -32,7 +32,7 @@ public class MaterialBatchDO extends BusinessBaseDO {
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 产品id
|
||||
* 物料大类id
|
||||
*/
|
||||
@TableField("PDT_ID")
|
||||
private Long productId;
|
||||
@@ -60,18 +60,33 @@ public class MaterialBatchDO extends BusinessBaseDO {
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField("MFR_DT")
|
||||
private LocalDateTime manufacturerDate;
|
||||
private LocalDate manufacturerDate;
|
||||
/**
|
||||
* 到期日期
|
||||
*/
|
||||
@TableField("DUE_DT")
|
||||
private LocalDateTime dueDate;
|
||||
private LocalDate dueDate;
|
||||
/**
|
||||
* 验收状态
|
||||
*/
|
||||
@TableField("ACPT_STS")
|
||||
private String acceptanceStatus;
|
||||
/**
|
||||
* 是否检化验,1-是，0-否
|
||||
*/
|
||||
@TableField("ASY_FLG")
|
||||
private Integer assayFlag;
|
||||
/**
|
||||
* 检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过
|
||||
*/
|
||||
@TableField("ASY_STS")
|
||||
private String assayStatus;
|
||||
/**
|
||||
* 检化验结果
|
||||
*/
|
||||
@TableField("ASY_RSLT")
|
||||
private String assayResult;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 物料实例 DO
|
||||
*
|
||||
@@ -56,6 +58,26 @@ public class MaterialInfomationDO extends BusinessBaseDO {
|
||||
@TableField("PRM")
|
||||
private String parameter;
|
||||
/**
|
||||
* 上架状态,0-未上架，1-已上架
|
||||
*/
|
||||
@TableField("PUB_STS")
|
||||
private Integer publishStatus;
|
||||
/**
|
||||
* 领用状态,0-未领用，1-已领用
|
||||
*/
|
||||
@TableField("USG_STS")
|
||||
private Integer usageStatus;
|
||||
/**
|
||||
* 所属部门ID
|
||||
*/
|
||||
@TableField("MNGR_DEPT_ID")
|
||||
private Integer managerDepartmentId;
|
||||
/**
|
||||
* 领用人部门
|
||||
*/
|
||||
@TableField("MNGR_DEPT_NAME")
|
||||
private String managerDepartmentName;
|
||||
/**
|
||||
* 负责人id
|
||||
*/
|
||||
@TableField("MNGR_USER_ID")
|
||||
@@ -66,31 +88,21 @@ public class MaterialInfomationDO extends BusinessBaseDO {
|
||||
@TableField("MNGR_USER_NAME")
|
||||
private String managerUserName;
|
||||
/**
|
||||
* 上架状态,0-未上架；1-已上架，默认0
|
||||
*/
|
||||
@TableField("PUB_STS")
|
||||
private String publishStatus;
|
||||
/**
|
||||
* 领用状态
|
||||
*/
|
||||
@TableField("USG_STS")
|
||||
private String usageStatus;
|
||||
/**
|
||||
* 开封状态
|
||||
* 开封状态,0-未开封，1-已开封
|
||||
*/
|
||||
@TableField("OPN_STS")
|
||||
private String openStatus;
|
||||
/**
|
||||
* 开封人
|
||||
*/
|
||||
@TableField("OPN_USER_NAME")
|
||||
private String openUserName;
|
||||
private Integer openStatus;
|
||||
/**
|
||||
* 开封人id
|
||||
*/
|
||||
@TableField("OPN_USER_ID")
|
||||
private Long openUserId;
|
||||
/**
|
||||
* 开封人
|
||||
*/
|
||||
@TableField("OPN_USER_NAME")
|
||||
private String openUserName;
|
||||
/**
|
||||
* 开封日期
|
||||
*/
|
||||
@TableField("OPN_DT")
|
||||
@@ -99,7 +111,7 @@ public class MaterialInfomationDO extends BusinessBaseDO {
|
||||
* 到期日期
|
||||
*/
|
||||
@TableField("EXPR_DT")
|
||||
private LocalDateTime expirationDate;
|
||||
private LocalDate expirationDate;
|
||||
/**
|
||||
* 过期状态
|
||||
*/
|
||||
@@ -111,6 +123,11 @@ public class MaterialInfomationDO extends BusinessBaseDO {
|
||||
@TableField("RMNG_VOL")
|
||||
private String remainingVolume;
|
||||
/**
|
||||
* 用完标记,0-未标记，1-已用完标记
|
||||
*/
|
||||
@TableField("USE_END_FLG")
|
||||
private Integer useEndFlag;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
@@ -121,9 +138,4 @@ public class MaterialInfomationDO extends BusinessBaseDO {
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 库存入库id
|
||||
*/
|
||||
@TableField("INVT_INB_ID")
|
||||
private long inventoryInboundId;
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 库存盘点项 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_chk_bat")
|
||||
@KeySequence("t_mtrl_invt_chk_bat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryCheckBatchDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 父id
|
||||
*/
|
||||
@TableField("CHK_ID")
|
||||
private Long checkId;
|
||||
/**
|
||||
* 盘点物料大类ID
|
||||
*/
|
||||
@TableField("CHK_PDT_ID")
|
||||
private Long checkProductId;
|
||||
/**
|
||||
* 盘点部门ID
|
||||
*/
|
||||
@TableField("CHK_DEPT_ID")
|
||||
private Long checkDepartmentId;
|
||||
/**
|
||||
* 应有量
|
||||
*/
|
||||
@TableField("EXPT")
|
||||
private String expected;
|
||||
/**
|
||||
* 实有量
|
||||
*/
|
||||
@TableField("ACT")
|
||||
private String actual;
|
||||
/**
|
||||
* 差异
|
||||
*/
|
||||
@TableField("DIFF")
|
||||
private String difference;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 库存盘点 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_chk")
|
||||
@KeySequence("t_mtrl_invt_chk_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryCheckDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@TableField("TTL")
|
||||
private String title;
|
||||
/**
|
||||
* 业务类型
|
||||
*/
|
||||
@TableField("BSN_TP")
|
||||
private String businessType;
|
||||
/**
|
||||
* 业务类型编码
|
||||
*/
|
||||
@TableField("BSN_TP_CD")
|
||||
private String businessTypeCode;
|
||||
/**
|
||||
* 申请人
|
||||
*/
|
||||
@TableField("APL_USER")
|
||||
private String applyUser;
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@TableField("APL_USER_ID")
|
||||
private Long applyUserId;
|
||||
/**
|
||||
* 申请部门
|
||||
*/
|
||||
@TableField("APL_DEPT")
|
||||
private String applyDepartment;
|
||||
/**
|
||||
* 申请部门id
|
||||
*/
|
||||
@TableField("APL_DEPT_ID")
|
||||
private Long applyDepartmentId;
|
||||
/**
|
||||
* 申请时间
|
||||
*/
|
||||
@TableField("APL_TM")
|
||||
private LocalDateTime applyTime;
|
||||
/**
|
||||
* 流程实例id
|
||||
*/
|
||||
@TableField("FLW_INSC_ID")
|
||||
private String flowInstanceId;
|
||||
/**
|
||||
* 流程审批状态
|
||||
*/
|
||||
@TableField("FLW_STS")
|
||||
private String flowStatus;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 库存盘点明细 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_chk_dtl")
|
||||
@KeySequence("t_mtrl_invt_chk_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryCheckDetailDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 盘点批次id
|
||||
*/
|
||||
@TableField("CHK_BAT_ID")
|
||||
private Long checkBatchId;
|
||||
/**
|
||||
* 物料实例id
|
||||
*/
|
||||
@TableField("INF_ID")
|
||||
private Long infomationId;
|
||||
/**
|
||||
* 是否存在
|
||||
*/
|
||||
@TableField("PRST")
|
||||
private String present;
|
||||
/**
|
||||
* 当前数量
|
||||
*/
|
||||
@TableField("CRNT_QTY")
|
||||
private String currentQuantity;
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@TableField("STS")
|
||||
private String status;
|
||||
/**
|
||||
* 处置方式,字典配置
|
||||
*/
|
||||
@TableField("DSPL_MTHD")
|
||||
private String disposalMethod;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,169 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
import lombok.*;
|
||||
|
||||
/**
|
||||
* 物料大类 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_pdt")
|
||||
@KeySequence("t_mtrl_pdt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 父id
|
||||
*/
|
||||
@TableField("PRN_ID")
|
||||
private Long parentId;
|
||||
/**
|
||||
* id路径
|
||||
*/
|
||||
@TableField("ID_PATH")
|
||||
private String idPath;
|
||||
/**
|
||||
* 节点类型,分类|产品
|
||||
*/
|
||||
@TableField("NDE_TP")
|
||||
private String nodeType;
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@TableField("NAME")
|
||||
private String name;
|
||||
/**
|
||||
* 其他配置
|
||||
*/
|
||||
@TableField("CST_CFG")
|
||||
private String customConfig;
|
||||
/**
|
||||
* 自定义表单
|
||||
*/
|
||||
@TableField("CST_FORM")
|
||||
private String customForm;
|
||||
/**
|
||||
* 扩展数据
|
||||
*/
|
||||
@TableField("CST_DAT")
|
||||
private String customData;
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
@TableField("TAG")
|
||||
private String tag;
|
||||
/**
|
||||
* 标签模板
|
||||
*/
|
||||
@TableField("LBL_TMPL_KY")
|
||||
private String labelTemplateKey;
|
||||
/**
|
||||
* 型号
|
||||
*/
|
||||
@TableField("MDL_NO")
|
||||
private String modelNo;
|
||||
/**
|
||||
* 规格
|
||||
*/
|
||||
@TableField("SPEC")
|
||||
private String specification;
|
||||
/**
|
||||
* 技术参数
|
||||
*/
|
||||
@TableField("PRM")
|
||||
private String parameter;
|
||||
/**
|
||||
* 制造商
|
||||
*/
|
||||
@TableField("MFR")
|
||||
private String manufacturer;
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
@TableField("UNT")
|
||||
private String unit;
|
||||
/**
|
||||
* 允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走
|
||||
*/
|
||||
@TableField("ENB_PRTL")
|
||||
private String enablePartial;
|
||||
/**
|
||||
* 保质期（天）
|
||||
*/
|
||||
@TableField("DUE")
|
||||
private Integer due;
|
||||
/**
|
||||
* 开封后保质期是否变化
|
||||
*/
|
||||
@TableField("OPN_DUE_FLG")
|
||||
private String openDueFlag;
|
||||
/**
|
||||
* 开封后保质期（天）
|
||||
*/
|
||||
@TableField("OPN_DUE_AFT")
|
||||
private Integer openDueAfter;
|
||||
/**
|
||||
* 是否危险品
|
||||
*/
|
||||
@TableField("HZRD")
|
||||
private String hazardous;
|
||||
/**
|
||||
* 是否标准溶液
|
||||
*/
|
||||
@TableField("STD_SOL_FLG")
|
||||
private String standardSolutionFlag;
|
||||
/**
|
||||
* 是否标准物质
|
||||
*/
|
||||
@TableField("STD_MTRL_FLG")
|
||||
private String standardMaterialFlag;
|
||||
/**
|
||||
* 复标周期,单位：天。小于等于0-不复标
|
||||
*/
|
||||
@TableField("RVW_DUE")
|
||||
private Integer reviewDue;
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
@TableField("SRT_NO")
|
||||
private Integer sortNo;
|
||||
/**
|
||||
* 禁用
|
||||
*/
|
||||
@TableField("CNL_FLG")
|
||||
private String cancelFlag;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 总数量
|
||||
*/
|
||||
@TableField("INB_QTY")
|
||||
private Long inboundQuantity;
|
||||
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 入库 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_inb")
|
||||
@KeySequence("t_mtrl_invt_inb_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryInboundDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@TableField("TTL")
|
||||
private String title;
|
||||
/**
|
||||
* 业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等
|
||||
*/
|
||||
@TableField("BSN_TP")
|
||||
private String businessType;
|
||||
/**
|
||||
* 业务类型编码
|
||||
*/
|
||||
@TableField("BSN_TP_CD")
|
||||
private String businessTypeCode;
|
||||
/**
|
||||
* 申请人
|
||||
*/
|
||||
@TableField("APL_USER")
|
||||
private String applyUser;
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@TableField("APL_USER_ID")
|
||||
private Long applyUserId;
|
||||
/**
|
||||
* 申请部门
|
||||
*/
|
||||
@TableField("APL_DEPT")
|
||||
private String applyDepartment;
|
||||
/**
|
||||
* 申请部门id
|
||||
*/
|
||||
@TableField("APL_DEPT_ID")
|
||||
private Long applyDepartmentId;
|
||||
/**
|
||||
* 申请时间
|
||||
*/
|
||||
@TableField("APL_TM")
|
||||
private LocalDateTime applyTime;
|
||||
/**
|
||||
* 流程实例id
|
||||
*/
|
||||
@TableField("FLW_INSC_ID")
|
||||
private String flowInstanceId;
|
||||
/**
|
||||
* 流程审批状态
|
||||
*/
|
||||
@TableField("FLW_STS")
|
||||
private String flowStatus;
|
||||
/**
|
||||
* 意见json
|
||||
*/
|
||||
@TableField("CMT_JSON")
|
||||
private String commentJson;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_inb_dtl")
|
||||
@KeySequence("t_mtrl_invt_inb_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryInboundDetailDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 入库单ID
|
||||
*/
|
||||
@TableField("INB_ID")
|
||||
private Long inboundId;
|
||||
/**
|
||||
* 分发批次id
|
||||
*/
|
||||
@TableField("BAT_ASN_ID")
|
||||
private Long batchAssignId;
|
||||
/**
|
||||
* 入库方式
|
||||
*/
|
||||
@TableField("INB_WY")
|
||||
private String inboundWay;
|
||||
/**
|
||||
* 物料实例ID
|
||||
*/
|
||||
@TableField("MTRL_INF_ID")
|
||||
private Long materialInfomationId;
|
||||
/**
|
||||
* 入库人
|
||||
*/
|
||||
@TableField("INB_USER_NAME")
|
||||
private String inboundUserName;
|
||||
/**
|
||||
* 入库人id
|
||||
*/
|
||||
@TableField("INB_USER_ID")
|
||||
private Long inboundUserId;
|
||||
/**
|
||||
* 入库人部门
|
||||
*/
|
||||
@TableField("INB_DEPT_NAME")
|
||||
private String inboundDepartmentName;
|
||||
/**
|
||||
* 入库人部门id
|
||||
*/
|
||||
@TableField("INB_DEPT_ID")
|
||||
private Long inboundDepartmentId;
|
||||
/**
|
||||
* 入库时间
|
||||
*/
|
||||
@TableField("INB_TM")
|
||||
private LocalDateTime inboundTime;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 出库 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_outb")
|
||||
@KeySequence("t_mtrl_invt_outb_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryOutboundDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@TableField("TTL")
|
||||
private String title;
|
||||
/**
|
||||
* 业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等
|
||||
*/
|
||||
@TableField("BSN_TP")
|
||||
private String businessType;
|
||||
/**
|
||||
* 业务类型编码
|
||||
*/
|
||||
@TableField("BSN_TP_CD")
|
||||
private String businessTypeCode;
|
||||
/**
|
||||
* 申请人
|
||||
*/
|
||||
@TableField("APL_USER")
|
||||
private String applyUser;
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@TableField("APL_USER_ID")
|
||||
private Long applyUserId;
|
||||
/**
|
||||
* 申请部门
|
||||
*/
|
||||
@TableField("APL_DEPT")
|
||||
private String applyDepartment;
|
||||
/**
|
||||
* 申请部门id
|
||||
*/
|
||||
@TableField("APL_DEPT_ID")
|
||||
private Long applyDepartmentId;
|
||||
/**
|
||||
* 申请时间
|
||||
*/
|
||||
@TableField("APL_TM")
|
||||
private LocalDateTime applyTime;
|
||||
/**
|
||||
* 监督人
|
||||
*/
|
||||
@TableField("CHK_USER")
|
||||
private String checkUser;
|
||||
/**
|
||||
* 监督人id
|
||||
*/
|
||||
@TableField("CHK_USER_ID")
|
||||
private Long checkUserId;
|
||||
/**
|
||||
* 流程实例id
|
||||
*/
|
||||
@TableField("FLW_INSC_ID")
|
||||
private String flowInstanceId;
|
||||
/**
|
||||
* 意见json
|
||||
*/
|
||||
@TableField("CMT_JSON")
|
||||
private String commentJson;
|
||||
/**
|
||||
* 流程审批状态
|
||||
*/
|
||||
@TableField("FLW_STS")
|
||||
private String flowStatus;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_invt_outb_dtl")
|
||||
@KeySequence("t_mtrl_invt_outb_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialInventoryOutboundDetailDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 出库单id
|
||||
*/
|
||||
@TableField("PRN_ID")
|
||||
private Long parentId;
|
||||
/**
|
||||
* 物料实例id
|
||||
*/
|
||||
@TableField("INF_ID")
|
||||
private Long infomationId;
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField("QTY")
|
||||
private String quantity;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 物料通用流程 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_lfc")
|
||||
@KeySequence("t_mtrl_lfc_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialLifecycleDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@TableField("TTL")
|
||||
private String title;
|
||||
/**
|
||||
* 业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请
|
||||
*/
|
||||
@TableField("BSN_TP")
|
||||
private String businessType;
|
||||
/**
|
||||
* 业务类型编码
|
||||
*/
|
||||
@TableField("BSN_TP_CD")
|
||||
private String businessTypeCode;
|
||||
/**
|
||||
* 申请人
|
||||
*/
|
||||
@TableField("APL_USER")
|
||||
private String applyUser;
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
@TableField("APL_USER_ID")
|
||||
private Long applyUserId;
|
||||
/**
|
||||
* 申请部门
|
||||
*/
|
||||
@TableField("APL_DEPT")
|
||||
private String applyDepartment;
|
||||
/**
|
||||
* 申请部门id
|
||||
*/
|
||||
@TableField("APL_DEPT_ID")
|
||||
private Long applyDepartmentId;
|
||||
/**
|
||||
* 申请时间
|
||||
*/
|
||||
@TableField("APL_TM")
|
||||
private LocalDateTime applyTime;
|
||||
/**
|
||||
* 表单数据,表单数据
|
||||
*/
|
||||
@TableField("FORM_DAT")
|
||||
private String formData;
|
||||
/**
|
||||
* 流程实例id
|
||||
*/
|
||||
@TableField("FLW_INSC_ID")
|
||||
private String flowInstanceId;
|
||||
/**
|
||||
* 流程审批状态
|
||||
*/
|
||||
@TableField("FLW_STS")
|
||||
private String flowStatus;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import lombok.*;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
/**
|
||||
* 物料通用流程明细,对应生命周期的明细 DO
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@TableName("t_mtrl_lfc_dtl")
|
||||
@KeySequence("t_mtrl_lfc_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
/**
|
||||
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
|
||||
*/
|
||||
public class MaterialLifecycleDetailDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
/**
|
||||
* 父ID
|
||||
*/
|
||||
@TableField("MTRL_LFC_ID")
|
||||
private Long materialLifecycleId;
|
||||
/**
|
||||
* 物料批次编号
|
||||
*/
|
||||
@TableField("BAT_ID")
|
||||
private Long batchId;
|
||||
/**
|
||||
* 物料大类编号
|
||||
*/
|
||||
@TableField("CTGR_PDT_ID")
|
||||
private String categoryProductId;
|
||||
/**
|
||||
* 物料实例编号
|
||||
*/
|
||||
@TableField("INF_ID")
|
||||
private Long infomationId;
|
||||
/**
|
||||
* 影响数量
|
||||
*/
|
||||
@TableField("INFL_CNT")
|
||||
private String influenceCount;
|
||||
/**
|
||||
* 明细操作类型
|
||||
*/
|
||||
@TableField("BSN_TP")
|
||||
private String businessType;
|
||||
/**
|
||||
* 处理状态
|
||||
*/
|
||||
@TableField("TMT_STS")
|
||||
private Integer treatmentStatus;
|
||||
/**
|
||||
* 表单数据,表单数据
|
||||
*/
|
||||
@TableField("FORM_DAT")
|
||||
private String formData;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
private String systemDepartmentCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField("RMK")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -44,16 +44,16 @@ public class MaterialLocationDO extends BusinessBaseDO {
|
||||
@TableField("CD")
|
||||
private String code;
|
||||
/**
|
||||
* 编码路径
|
||||
*/
|
||||
@TableField("CD_PATH")
|
||||
private String codePath;
|
||||
/**
|
||||
* 容量
|
||||
*/
|
||||
@TableField("CPY")
|
||||
private String capacity;
|
||||
/**
|
||||
* 位置
|
||||
*/
|
||||
@TableField("LOC")
|
||||
private String location;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField("SYS_DEPT_CD")
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.dataobject;
|
||||
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
|
||||
import lombok.*;
|
||||
|
||||
/**
|
||||
* 物料大类 DO
|
||||
*
|
||||
@@ -21,8 +22,6 @@ import lombok.*;
|
||||
*/
|
||||
public class MaterialProductDO extends BusinessBaseDO {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@@ -39,11 +38,21 @@ public class MaterialProductDO extends BusinessBaseDO {
|
||||
@TableField("ID_PATH")
|
||||
private String idPath;
|
||||
/**
|
||||
* 节点类型,分类|产品
|
||||
* 节点类型,分类|物料
|
||||
*/
|
||||
@TableField("NDE_TP")
|
||||
private String nodeType;
|
||||
/**
|
||||
* 主数据ID,原始数据id
|
||||
*/
|
||||
@TableField("ORIG_MTRL_ID")
|
||||
private Long originalMaterialId;
|
||||
/**
|
||||
* 编码,原始数据编码
|
||||
*/
|
||||
@TableField("CD")
|
||||
private String code;
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@TableField("NAME")
|
||||
@@ -102,37 +111,37 @@ public class MaterialProductDO extends BusinessBaseDO {
|
||||
* 允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走
|
||||
*/
|
||||
@TableField("ENB_PRTL")
|
||||
private String enablePartial;
|
||||
private Integer enablePartial;
|
||||
/**
|
||||
* 保质期（天）
|
||||
*/
|
||||
@TableField("DUE")
|
||||
private Integer due;
|
||||
/**
|
||||
* 开封后保质期是否变化
|
||||
* 开封后保质期是否变化,1-是，0-否
|
||||
*/
|
||||
@TableField("OPN_DUE_FLG")
|
||||
private String openDueFlag;
|
||||
private Integer openDueFlag;
|
||||
/**
|
||||
* 开封后保质期（天）
|
||||
*/
|
||||
@TableField("OPN_DUE_AFT")
|
||||
private Integer openDueAfter;
|
||||
/**
|
||||
* 是否危险品
|
||||
* 是否危险品,1-是，0-否
|
||||
*/
|
||||
@TableField("HZRD")
|
||||
private String hazardous;
|
||||
private Integer hazardous;
|
||||
/**
|
||||
* 是否标准溶液
|
||||
* 是否标准溶液,1-是，0-否
|
||||
*/
|
||||
@TableField("STD_SOL_FLG")
|
||||
private String standardSolutionFlag;
|
||||
private Integer standardSolutionFlag;
|
||||
/**
|
||||
* 是否标准物质
|
||||
* 是否标准物质,1-是，0-否
|
||||
*/
|
||||
@TableField("STD_MTRL_FLG")
|
||||
private String standardMaterialFlag;
|
||||
private Integer standardMaterialFlag;
|
||||
/**
|
||||
* 复标周期,单位：天。小于等于0-不复标
|
||||
*/
|
||||
@@ -144,10 +153,25 @@ public class MaterialProductDO extends BusinessBaseDO {
|
||||
@TableField("SRT_NO")
|
||||
private Integer sortNo;
|
||||
/**
|
||||
* 禁用
|
||||
* 禁用标识
|
||||
*/
|
||||
@TableField("CNL_FLG")
|
||||
private String cancelFlag;
|
||||
private Integer cancelFlag;
|
||||
/**
|
||||
* 是否检化验,1-是，0-否
|
||||
*/
|
||||
@TableField("ASY_FLG")
|
||||
private Integer assayFlag;
|
||||
/**
|
||||
* 是否进行库存预警,1-是，0-否
|
||||
*/
|
||||
@TableField("INVT_ALM_FLG")
|
||||
private Integer InventoryAlarmFlag;
|
||||
/**
|
||||
* 库存预警区间,json格式配置
|
||||
*/
|
||||
@TableField("INVT_ALM_RNG")
|
||||
private String InventoryAlarmRange;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 物料批次分发 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialBatchAssignMapper extends BaseMapperX<MaterialBatchAssignDO> {
|
||||
|
||||
default PageResult<MaterialBatchAssignDO> selectPage(MaterialBatchAssignPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialBatchAssignDO>()
|
||||
.eqIfPresent(MaterialBatchAssignDO::getBatchId, reqVO.getBatchId())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getProductId, reqVO.getProductId())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getWarehouseId, reqVO.getWarehouseId())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getInboundQuantity, reqVO.getInboundQuantity())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getUrl, reqVO.getUrl())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialBatchAssignDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialBatchAssignDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialBatchAssignDO::getId));
|
||||
}
|
||||
|
||||
// default PageResult<MaterialBatchAssignDO> selectByInfId(MaterialBatchAssignPageReqVO reqVO) {
|
||||
// return selectPage(reqVO, new LambdaQueryWrapperX<MaterialBatchAssignDO>()
|
||||
// .eqIfPresent(MaterialBatchAssignDO::getMaterialInfomationId, reqVO.getMaterialInfomationId())
|
||||
// .orderByDesc(MaterialBatchAssignDO::getCreateTime));
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -3,8 +3,8 @@ package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -25,6 +25,9 @@ public interface MaterialBatchMapper extends BaseMapperX<MaterialBatchDO> {
|
||||
.betweenIfPresent(MaterialBatchDO::getManufacturerDate, reqVO.getManufacturerDate())
|
||||
.betweenIfPresent(MaterialBatchDO::getDueDate, reqVO.getDueDate())
|
||||
.eqIfPresent(MaterialBatchDO::getAcceptanceStatus, reqVO.getAcceptanceStatus())
|
||||
.eqIfPresent(MaterialBatchDO::getAssayFlag, reqVO.getAssayFlag())
|
||||
.eqIfPresent(MaterialBatchDO::getAssayStatus, reqVO.getAssayStatus())
|
||||
.eqIfPresent(MaterialBatchDO::getAssayResult, reqVO.getAssayResult())
|
||||
.eqIfPresent(MaterialBatchDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialBatchDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialBatchDO::getCreateTime, reqVO.getCreateTime())
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
@@ -19,37 +18,28 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
|
||||
default PageResult<MaterialInfomationDO> selectPage(MaterialInfomationPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInfomationDO>()
|
||||
.eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId())
|
||||
.inIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductIds())
|
||||
.eqIfPresent(MaterialInfomationDO::getBatchId, reqVO.getBatchId())
|
||||
.eqIfPresent(MaterialInfomationDO::getLocationId, reqVO.getLocationId())
|
||||
.eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode())
|
||||
.eqIfPresent(MaterialInfomationDO::getParameter, reqVO.getParameter())
|
||||
.eqIfPresent(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId())
|
||||
.likeIfPresent(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName())
|
||||
.eqIfPresent(MaterialInfomationDO::getPublishStatus, reqVO.getPublishStatus())
|
||||
.eqIfPresent(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus())
|
||||
.eqIfPresent(MaterialInfomationDO::getManagerDepartmentId, reqVO.getManagerDepartmentId())
|
||||
.likeIfPresent(MaterialInfomationDO::getManagerDepartmentName, reqVO.getManagerDepartmentName())
|
||||
.eqIfPresent(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId())
|
||||
.likeIfPresent(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName())
|
||||
.eqIfPresent(MaterialInfomationDO::getOpenStatus, reqVO.getOpenStatus())
|
||||
.likeIfPresent(MaterialInfomationDO::getOpenUserName, reqVO.getOpenUserName())
|
||||
.eqIfPresent(MaterialInfomationDO::getOpenUserId, reqVO.getOpenUserId())
|
||||
.likeIfPresent(MaterialInfomationDO::getOpenUserName, reqVO.getOpenUserName())
|
||||
.betweenIfPresent(MaterialInfomationDO::getOpenDate, reqVO.getOpenDate())
|
||||
.betweenIfPresent(MaterialInfomationDO::getExpirationDate, reqVO.getExpirationDate())
|
||||
.eqIfPresent(MaterialInfomationDO::getExpirationFlag, reqVO.getExpirationFlag())
|
||||
.eqIfPresent(MaterialInfomationDO::getRemainingVolume, reqVO.getRemainingVolume())
|
||||
.eqIfPresent(MaterialInfomationDO::getUseEndFlag, reqVO.getUseEndFlag())
|
||||
.eqIfPresent(MaterialInfomationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInfomationDO::getId));
|
||||
}
|
||||
|
||||
default PageResult<MaterialInfomationDO> selectAll(MaterialInfomationPageReqVO reqVO) {
|
||||
reqVO.setPageSize(-1);
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInfomationDO>()
|
||||
.eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId())
|
||||
.eqIfPresent(MaterialInfomationDO::getBatchId, reqVO.getBatchId())
|
||||
.eqIfPresent(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus())
|
||||
.eqIfPresent(MaterialInfomationDO::getInventoryInboundId, reqVO.getInventoryInboundId()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 库存盘点项 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryCheckBatchMapper extends BaseMapperX<MaterialInventoryCheckBatchDO> {
|
||||
|
||||
default PageResult<MaterialInventoryCheckBatchDO> selectPage(MaterialInventoryCheckBatchPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryCheckBatchDO>()
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getCheckId, reqVO.getCheckId())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getCheckProductId, reqVO.getCheckProductId())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getCheckDepartmentId, reqVO.getCheckDepartmentId())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getExpected, reqVO.getExpected())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getActual, reqVO.getActual())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getDifference, reqVO.getDifference())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryCheckBatchDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryCheckBatchDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryCheckBatchDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 库存盘点明细 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryCheckDetailMapper extends BaseMapperX<MaterialInventoryCheckDetailDO> {
|
||||
|
||||
default PageResult<MaterialInventoryCheckDetailDO> selectPage(MaterialInventoryCheckDetailPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryCheckDetailDO>()
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getCheckBatchId, reqVO.getCheckBatchId())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getInfomationId, reqVO.getInfomationId())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getPresent, reqVO.getPresent())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getCurrentQuantity, reqVO.getCurrentQuantity())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getStatus, reqVO.getStatus())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getDisposalMethod, reqVO.getDisposalMethod())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryCheckDetailDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryCheckDetailDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryCheckDetailDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 库存盘点 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryCheckMapper extends BaseMapperX<MaterialInventoryCheckDO> {
|
||||
|
||||
default PageResult<MaterialInventoryCheckDO> selectPage(MaterialInventoryCheckPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryCheckDO>()
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getTitle, reqVO.getTitle())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getBusinessType, reqVO.getBusinessType())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getBusinessTypeCode, reqVO.getBusinessTypeCode())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getApplyUser, reqVO.getApplyUser())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getApplyUserId, reqVO.getApplyUserId())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getApplyDepartment, reqVO.getApplyDepartment())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getApplyDepartmentId, reqVO.getApplyDepartmentId())
|
||||
.betweenIfPresent(MaterialInventoryCheckDO::getApplyTime, reqVO.getApplyTime())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getFlowInstanceId, reqVO.getFlowInstanceId())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getFlowStatus, reqVO.getFlowStatus())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryCheckDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryCheckDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryCheckDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataExtendRespVO;
|
||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
|
||||
import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryInboundDetailMapper extends BaseMapperX<MaterialInventoryInboundDetailDO> {
|
||||
|
||||
default PageResult<MaterialInventoryInboundDetailDO> selectPage(MaterialInventoryInboundDetailPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryInboundDetailDO>()
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getInboundId, reqVO.getInboundId())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getBatchAssignId, reqVO.getBatchAssignId())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getInboundWay, reqVO.getInboundWay())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getMaterialInfomationId, reqVO.getMaterialInfomationId())
|
||||
.likeIfPresent(MaterialInventoryInboundDetailDO::getInboundUserName, reqVO.getInboundUserName())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getInboundUserId, reqVO.getInboundUserId())
|
||||
.likeIfPresent(MaterialInventoryInboundDetailDO::getInboundDepartmentName, reqVO.getInboundDepartmentName())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getInboundDepartmentId, reqVO.getInboundDepartmentId())
|
||||
.betweenIfPresent(MaterialInventoryInboundDetailDO::getInboundTime, reqVO.getInboundTime())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryInboundDetailDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryInboundDetailDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryInboundDetailDO::getId));
|
||||
}
|
||||
|
||||
default PageResult<MaterialInventoryInboundDetailRespVO> selectPageList(MaterialInventoryInboundDetailPageReqVO reqVO) {
|
||||
return selectJoinPage(reqVO, MaterialInventoryInboundDetailRespVO.class, new MPJLambdaWrapperX<MaterialInventoryInboundDetailDO>()
|
||||
.selectAll(MaterialInventoryInboundDetailDO.class)
|
||||
.selectAs(MaterialInfomationDO::getProductId, MaterialInventoryInboundDetailRespVO::getProductId)
|
||||
.leftJoin(MaterialInfomationDO.class, MaterialInfomationDO::getId, MaterialInventoryInboundDetailDO::getMaterialInfomationId)
|
||||
.eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId())
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 入库 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryInboundMapper extends BaseMapperX<MaterialInventoryInboundDO> {
|
||||
|
||||
default PageResult<MaterialInventoryInboundDO> selectPage(MaterialInventoryInboundPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryInboundDO>()
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getTitle, reqVO.getTitle())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getBusinessType, reqVO.getBusinessType())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getBusinessTypeCode, reqVO.getBusinessTypeCode())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getApplyUser, reqVO.getApplyUser())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getApplyUserId, reqVO.getApplyUserId())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getApplyDepartment, reqVO.getApplyDepartment())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getApplyDepartmentId, reqVO.getApplyDepartmentId())
|
||||
.betweenIfPresent(MaterialInventoryInboundDO::getApplyTime, reqVO.getApplyTime())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getFlowInstanceId, reqVO.getFlowInstanceId())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getFlowStatus, reqVO.getFlowStatus())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getCommentJson, reqVO.getCommentJson())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryInboundDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryInboundDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryInboundDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 入库 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryMapper extends BaseMapperX<MaterialInventoryDO> {
|
||||
|
||||
// default PageResult<MaterialInventoryDO> selectPage(MaterialInventoryRespVO reqVO) {
|
||||
// return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryDO>()
|
||||
//
|
||||
// .eqIfPresent(MaterialInventoryDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
// .eqIfPresent(MaterialInventoryDO::getRemark, reqVO.getRemark())
|
||||
// .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime())
|
||||
// .orderByDesc(MaterialInventoryDO::getId));
|
||||
// }
|
||||
|
||||
IPage<MaterialInventoryDO> selectPageList (IPage<?> page,@Param("param")MaterialInventoryRespVO RespVO);
|
||||
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryOutboundDetailMapper extends BaseMapperX<MaterialInventoryOutboundDetailDO> {
|
||||
|
||||
default PageResult<MaterialInventoryOutboundDetailDO> selectPage(MaterialInventoryOutboundDetailPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryOutboundDetailDO>()
|
||||
.eqIfPresent(MaterialInventoryOutboundDetailDO::getParentId, reqVO.getParentId())
|
||||
.eqIfPresent(MaterialInventoryOutboundDetailDO::getInfomationId, reqVO.getInfomationId())
|
||||
.eqIfPresent(MaterialInventoryOutboundDetailDO::getQuantity, reqVO.getQuantity())
|
||||
.eqIfPresent(MaterialInventoryOutboundDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryOutboundDetailDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryOutboundDetailDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryOutboundDetailDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 出库 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialInventoryOutboundMapper extends BaseMapperX<MaterialInventoryOutboundDO> {
|
||||
|
||||
default PageResult<MaterialInventoryOutboundDO> selectPage(MaterialInventoryOutboundPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialInventoryOutboundDO>()
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getTitle, reqVO.getTitle())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getBusinessType, reqVO.getBusinessType())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getBusinessTypeCode, reqVO.getBusinessTypeCode())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getApplyUser, reqVO.getApplyUser())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getApplyUserId, reqVO.getApplyUserId())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getApplyDepartment, reqVO.getApplyDepartment())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getApplyDepartmentId, reqVO.getApplyDepartmentId())
|
||||
.betweenIfPresent(MaterialInventoryOutboundDO::getApplyTime, reqVO.getApplyTime())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getCheckUser, reqVO.getCheckUser())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getCheckUserId, reqVO.getCheckUserId())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getFlowInstanceId, reqVO.getFlowInstanceId())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getCommentJson, reqVO.getCommentJson())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getFlowStatus, reqVO.getFlowStatus())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialInventoryOutboundDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialInventoryOutboundDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialInventoryOutboundDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDetailDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 物料通用流程明细,对应生命周期的明细 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialLifecycleDetailMapper extends BaseMapperX<MaterialLifecycleDetailDO> {
|
||||
|
||||
default PageResult<MaterialLifecycleDetailDO> selectPage(MaterialLifecycleDetailPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialLifecycleDetailDO>()
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getMaterialLifecycleId, reqVO.getMaterialLifecycleId())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getBatchId, reqVO.getBatchId())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getCategoryProductId, reqVO.getCategoryProductId())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getInfomationId, reqVO.getInfomationId())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getInfluenceCount, reqVO.getInfluenceCount())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getBusinessType, reqVO.getBusinessType())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getTreatmentStatus, reqVO.getTreatmentStatus())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getFormData, reqVO.getFormData())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.likeIfPresent(MaterialLifecycleDetailDO::getCompanyName, reqVO.getCompanyName())
|
||||
.eqIfPresent(MaterialLifecycleDetailDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialLifecycleDetailDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialLifecycleDetailDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 物料通用流程 Mapper
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaterialLifecycleMapper extends BaseMapperX<MaterialLifecycleDO> {
|
||||
|
||||
default PageResult<MaterialLifecycleDO> selectPage(MaterialLifecyclePageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialLifecycleDO>()
|
||||
.eqIfPresent(MaterialLifecycleDO::getTitle, reqVO.getTitle())
|
||||
.eqIfPresent(MaterialLifecycleDO::getBusinessType, reqVO.getBusinessType())
|
||||
.eqIfPresent(MaterialLifecycleDO::getBusinessTypeCode, reqVO.getBusinessTypeCode())
|
||||
.eqIfPresent(MaterialLifecycleDO::getApplyUser, reqVO.getApplyUser())
|
||||
.eqIfPresent(MaterialLifecycleDO::getApplyUserId, reqVO.getApplyUserId())
|
||||
.eqIfPresent(MaterialLifecycleDO::getApplyDepartment, reqVO.getApplyDepartment())
|
||||
.eqIfPresent(MaterialLifecycleDO::getApplyDepartmentId, reqVO.getApplyDepartmentId())
|
||||
.betweenIfPresent(MaterialLifecycleDO::getApplyTime, reqVO.getApplyTime())
|
||||
.eqIfPresent(MaterialLifecycleDO::getFormData, reqVO.getFormData())
|
||||
.eqIfPresent(MaterialLifecycleDO::getFlowInstanceId, reqVO.getFlowInstanceId())
|
||||
.eqIfPresent(MaterialLifecycleDO::getFlowStatus, reqVO.getFlowStatus())
|
||||
.eqIfPresent(MaterialLifecycleDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialLifecycleDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialLifecycleDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MaterialLifecycleDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,8 +3,8 @@ package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLocationDO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLocationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLocationDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -20,8 +20,8 @@ public interface MaterialLocationMapper extends BaseMapperX<MaterialLocationDO>
|
||||
.eqIfPresent(MaterialLocationDO::getParentId, reqVO.getParentId())
|
||||
.likeIfPresent(MaterialLocationDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MaterialLocationDO::getCode, reqVO.getCode())
|
||||
.eqIfPresent(MaterialLocationDO::getCodePath, reqVO.getCodePath())
|
||||
.eqIfPresent(MaterialLocationDO::getCapacity, reqVO.getCapacity())
|
||||
.eqIfPresent(MaterialLocationDO::getLocation, reqVO.getLocation())
|
||||
.eqIfPresent(MaterialLocationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialLocationDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialLocationDO::getCreateTime, reqVO.getCreateTime())
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.zt.plat.module.qms.resource.material.dal.mapper;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
@@ -20,31 +20,32 @@ public interface MaterialProductMapper extends BaseMapperX<MaterialProductDO> {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialProductDO>()
|
||||
.eqIfPresent(MaterialProductDO::getParentId, reqVO.getParentId())
|
||||
.likeIfPresent(MaterialProductDO::getIdPath, reqVO.getIdPath())
|
||||
.eqIfPresent(MaterialProductDO::getNodeType, reqVO.getNodeType())
|
||||
.likeIfPresent(MaterialProductDO::getName, reqVO.getName())
|
||||
.eqIfPresent(MaterialProductDO::getCustomConfig, reqVO.getCustomConfig())
|
||||
.eqIfPresent(MaterialProductDO::getCustomForm, reqVO.getCustomForm())
|
||||
.eqIfPresent(MaterialProductDO::getCustomData, reqVO.getCustomData())
|
||||
.eqIfPresent(MaterialProductDO::getTag, reqVO.getTag())
|
||||
.eqIfPresent(MaterialProductDO::getLabelTemplateKey, reqVO.getLabelTemplateKey())
|
||||
.eqIfPresent(MaterialProductDO::getModelNo, reqVO.getModelNo())
|
||||
.eqIfPresent(MaterialProductDO::getSpecification, reqVO.getSpecification())
|
||||
.eqIfPresent(MaterialProductDO::getParameter, reqVO.getParameter())
|
||||
.eqIfPresent(MaterialProductDO::getManufacturer, reqVO.getManufacturer())
|
||||
.likeIfPresent(MaterialProductDO::getCustomConfig, reqVO.getCustomConfig())
|
||||
.likeIfPresent(MaterialProductDO::getCustomForm, reqVO.getCustomForm())
|
||||
.likeIfPresent(MaterialProductDO::getCustomData, reqVO.getCustomData())
|
||||
.likeIfPresent(MaterialProductDO::getTag, reqVO.getTag())
|
||||
.likeIfPresent(MaterialProductDO::getLabelTemplateKey, reqVO.getLabelTemplateKey())
|
||||
.likeIfPresent(MaterialProductDO::getModelNo, reqVO.getModelNo())
|
||||
.likeIfPresent(MaterialProductDO::getSpecification, reqVO.getSpecification())
|
||||
.likeIfPresent(MaterialProductDO::getParameter, reqVO.getParameter())
|
||||
.likeIfPresent(MaterialProductDO::getManufacturer, reqVO.getManufacturer())
|
||||
.eqIfPresent(MaterialProductDO::getUnit, reqVO.getUnit())
|
||||
.eqIfPresent(MaterialProductDO::getEnablePartial, reqVO.getEnablePartial())
|
||||
.eqIfPresent(MaterialProductDO::getDue, reqVO.getDue())
|
||||
.betweenIfPresent(MaterialProductDO::getDue, reqVO.getDue())
|
||||
.eqIfPresent(MaterialProductDO::getOpenDueFlag, reqVO.getOpenDueFlag())
|
||||
.eqIfPresent(MaterialProductDO::getOpenDueAfter, reqVO.getOpenDueAfter())
|
||||
.betweenIfPresent(MaterialProductDO::getOpenDueAfter, reqVO.getOpenDueAfter())
|
||||
.eqIfPresent(MaterialProductDO::getHazardous, reqVO.getHazardous())
|
||||
.eqIfPresent(MaterialProductDO::getStandardSolutionFlag, reqVO.getStandardSolutionFlag())
|
||||
.eqIfPresent(MaterialProductDO::getStandardMaterialFlag, reqVO.getStandardMaterialFlag())
|
||||
.eqIfPresent(MaterialProductDO::getReviewDue, reqVO.getReviewDue())
|
||||
.eqIfPresent(MaterialProductDO::getSortNo, reqVO.getSortNo())
|
||||
.betweenIfPresent(MaterialProductDO::getReviewDue, reqVO.getReviewDue())
|
||||
.eqIfPresent(MaterialProductDO::getCancelFlag, reqVO.getCancelFlag())
|
||||
.eqIfPresent(MaterialProductDO::getAssayFlag, reqVO.getAssayFlag())
|
||||
.eqIfPresent(MaterialProductDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
|
||||
.eqIfPresent(MaterialProductDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MaterialProductDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByAsc(MaterialProductDO::getSortNo)
|
||||
.orderByAsc(MaterialProductDO::getIdPath)
|
||||
.orderByDesc(MaterialProductDO::getId));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO;
|
||||
import jakarta.validation.*;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
|
||||
/**
|
||||
* 物料批次分发 Service 接口
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
public interface MaterialBatchAssignService {
|
||||
|
||||
/**
|
||||
* 创建物料批次分发
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
MaterialBatchAssignRespVO createMaterialBatchAssign(@Valid MaterialBatchAssignSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新物料批次分发
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateMaterialBatchAssign(@Valid MaterialBatchAssignSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除物料批次分发
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteMaterialBatchAssign(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除物料批次分发
|
||||
*
|
||||
* @param ids 编号
|
||||
*/
|
||||
void deleteMaterialBatchAssignListByIds(List<Long> ids);
|
||||
|
||||
/**
|
||||
* 获得物料批次分发
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 物料批次分发
|
||||
*/
|
||||
MaterialBatchAssignDO getMaterialBatchAssign(Long id);
|
||||
|
||||
/**
|
||||
* 用物料实例Id获得物料批次
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 物料批次分发
|
||||
*/
|
||||
public PageResult<MaterialBatchAssignDO> getMaterialBatchAssignByInfId(MaterialBatchAssignPageReqVO pageReqVO);
|
||||
|
||||
/**
|
||||
* 获得物料批次分发分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 物料批次分发分页
|
||||
*/
|
||||
PageResult<MaterialBatchAssignDO> getMaterialBatchAssignPage(MaterialBatchAssignPageReqVO pageReqVO);
|
||||
|
||||
|
||||
/**
|
||||
* 分发到实验室
|
||||
* @param createReqVO
|
||||
* @return
|
||||
*/
|
||||
MaterialBatchAssignRespVO assignLab(@Valid MaterialBatchAssignSaveReqVO createReqVO);
|
||||
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInfomationMapper;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.stereotype.Service;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchAssignMapper;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 物料批次分发 Service 实现类
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class MaterialBatchAssignServiceImpl implements MaterialBatchAssignService {
|
||||
|
||||
@Resource
|
||||
private MaterialBatchAssignMapper materialBatchAssignMapper;
|
||||
|
||||
@Resource
|
||||
private MaterialInfomationMapper materialInfomationMapper;
|
||||
|
||||
@Override
|
||||
public MaterialBatchAssignRespVO createMaterialBatchAssign(MaterialBatchAssignSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
MaterialBatchAssignDO materialBatchAssign = BeanUtils.toBean(createReqVO, MaterialBatchAssignDO.class);
|
||||
materialBatchAssignMapper.insert(materialBatchAssign);
|
||||
// 返回
|
||||
return BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMaterialBatchAssign(MaterialBatchAssignSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateMaterialBatchAssignExists(updateReqVO.getId());
|
||||
// 更新
|
||||
MaterialBatchAssignDO updateObj = BeanUtils.toBean(updateReqVO, MaterialBatchAssignDO.class);
|
||||
materialBatchAssignMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialBatchAssign(Long id) {
|
||||
// 校验存在
|
||||
validateMaterialBatchAssignExists(id);
|
||||
// 删除
|
||||
materialBatchAssignMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialBatchAssignListByIds(List<Long> ids) {
|
||||
// 校验存在
|
||||
validateMaterialBatchAssignExists(ids);
|
||||
// 删除
|
||||
materialBatchAssignMapper.deleteByIds(ids);
|
||||
}
|
||||
|
||||
private void validateMaterialBatchAssignExists(List<Long> ids) {
|
||||
List<MaterialBatchAssignDO> list = materialBatchAssignMapper.selectByIds(ids);
|
||||
if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
|
||||
throw exception(MATERIAL_BATCH_ASSIGN_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
private void validateMaterialBatchAssignExists(Long id) {
|
||||
if (materialBatchAssignMapper.selectById(id) == null) {
|
||||
throw exception(MATERIAL_BATCH_ASSIGN_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MaterialBatchAssignDO getMaterialBatchAssign(Long id) {
|
||||
return materialBatchAssignMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<MaterialBatchAssignDO> getMaterialBatchAssignByInfId(MaterialBatchAssignPageReqVO pageReqVO){
|
||||
return materialBatchAssignMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<MaterialBatchAssignDO> getMaterialBatchAssignPage(MaterialBatchAssignPageReqVO pageReqVO) {
|
||||
PageResult<MaterialBatchAssignDO> pageResult = materialBatchAssignMapper.selectPage(pageReqVO);
|
||||
|
||||
|
||||
|
||||
/** 统计批次剩余量需要除去已上架（存在实例）的部分 */
|
||||
pageResult.getList().forEach(item -> {
|
||||
MaterialInfomationPageReqVO infomationPageReqVO = new MaterialInfomationPageReqVO();
|
||||
infomationPageReqVO.setBatchId(item.getId());
|
||||
infomationPageReqVO.setProductId(item.getProductId());
|
||||
infomationPageReqVO.setUsageStatus("0");
|
||||
PageResult<MaterialInfomationDO> materialInfomationDOPageResult = materialInfomationMapper.selectAll(infomationPageReqVO);
|
||||
Long totalCount = materialInfomationDOPageResult.getTotalCount();
|
||||
// item.setInboundQuantity(item.getInboundQuantity()-totalCount);
|
||||
// 方案2: 添加边界检查，防止负数
|
||||
long calculatedQuantity = item.getInboundQuantity() - totalCount;
|
||||
item.setInboundQuantity(Math.max(0L, calculatedQuantity));
|
||||
});
|
||||
|
||||
|
||||
return pageResult;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public MaterialBatchAssignRespVO assignLab(MaterialBatchAssignSaveReqVO createReqVO){
|
||||
// 插入
|
||||
MaterialBatchAssignDO materialBatchAssign = BeanUtils.toBean(createReqVO, MaterialBatchAssignDO.class);
|
||||
materialBatchAssignMapper.insert(materialBatchAssign);
|
||||
// 返回
|
||||
return BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
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 jakarta.validation.*;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import jakarta.validation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料批次 Service 接口
|
||||
|
||||
@@ -1,23 +1,20 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
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 org.springframework.stereotype.Service;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchMapper;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchMapper;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO;
|
||||
import jakarta.validation.Valid;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.validation.*;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
|
||||
/**
|
||||
* 物料实例 Service 接口
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.zt.plat.module.qms.resource.material.service;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO;
|
||||
@@ -16,7 +15,7 @@ import org.springframework.validation.annotation.Validated;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_INFOMATION_NOT_EXISTS;
|
||||
|
||||
/**
|
||||
* 物料实例 Service 实现类
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO;
|
||||
import jakarta.validation.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
|
||||
/**
|
||||
* 库存盘点项 Service 接口
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
public interface MaterialInventoryCheckBatchService {
|
||||
|
||||
/**
|
||||
* 创建库存盘点项
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
MaterialInventoryCheckBatchRespVO createMaterialInventoryCheckBatch(@Valid MaterialInventoryCheckBatchSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新库存盘点项
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateMaterialInventoryCheckBatch(@Valid MaterialInventoryCheckBatchSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除库存盘点项
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteMaterialInventoryCheckBatch(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除库存盘点项
|
||||
*
|
||||
* @param ids 编号
|
||||
*/
|
||||
void deleteMaterialInventoryCheckBatchListByIds(List<Long> ids);
|
||||
|
||||
/**
|
||||
* 获得库存盘点项
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 库存盘点项
|
||||
*/
|
||||
MaterialInventoryCheckBatchDO getMaterialInventoryCheckBatch(Long id);
|
||||
|
||||
/**
|
||||
* 获得库存盘点项分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 库存盘点项分页
|
||||
*/
|
||||
PageResult<MaterialInventoryCheckBatchDO> getMaterialInventoryCheckBatchPage(MaterialInventoryCheckBatchPageReqVO pageReqVO);
|
||||
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.*;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.*;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckBatchMapper;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 库存盘点项 Service 实现类
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class MaterialInventoryCheckBatchServiceImpl implements MaterialInventoryCheckBatchService {
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryCheckBatchMapper materialInventoryCheckBatchMapper;
|
||||
|
||||
@Override
|
||||
public MaterialInventoryCheckBatchRespVO createMaterialInventoryCheckBatch(MaterialInventoryCheckBatchSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
MaterialInventoryCheckBatchDO materialInventoryCheckBatch = BeanUtils.toBean(createReqVO, MaterialInventoryCheckBatchDO.class);
|
||||
materialInventoryCheckBatchMapper.insert(materialInventoryCheckBatch);
|
||||
// 返回
|
||||
return BeanUtils.toBean(materialInventoryCheckBatch, MaterialInventoryCheckBatchRespVO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMaterialInventoryCheckBatch(MaterialInventoryCheckBatchSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckBatchExists(updateReqVO.getId());
|
||||
// 更新
|
||||
MaterialInventoryCheckBatchDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryCheckBatchDO.class);
|
||||
materialInventoryCheckBatchMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialInventoryCheckBatch(Long id) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckBatchExists(id);
|
||||
// 删除
|
||||
materialInventoryCheckBatchMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialInventoryCheckBatchListByIds(List<Long> ids) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckBatchExists(ids);
|
||||
// 删除
|
||||
materialInventoryCheckBatchMapper.deleteByIds(ids);
|
||||
}
|
||||
|
||||
private void validateMaterialInventoryCheckBatchExists(List<Long> ids) {
|
||||
List<MaterialInventoryCheckBatchDO> list = materialInventoryCheckBatchMapper.selectByIds(ids);
|
||||
if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
|
||||
throw exception(MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
private void validateMaterialInventoryCheckBatchExists(Long id) {
|
||||
if (materialInventoryCheckBatchMapper.selectById(id) == null) {
|
||||
throw exception(MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MaterialInventoryCheckBatchDO getMaterialInventoryCheckBatch(Long id) {
|
||||
return materialInventoryCheckBatchMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<MaterialInventoryCheckBatchDO> getMaterialInventoryCheckBatchPage(MaterialInventoryCheckBatchPageReqVO pageReqVO) {
|
||||
return materialInventoryCheckBatchMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO;
|
||||
import jakarta.validation.*;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
|
||||
/**
|
||||
* 库存盘点明细 Service 接口
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
public interface MaterialInventoryCheckDetailService {
|
||||
|
||||
/**
|
||||
* 创建库存盘点明细
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
MaterialInventoryCheckDetailRespVO createMaterialInventoryCheckDetail(@Valid MaterialInventoryCheckDetailSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新库存盘点明细
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateMaterialInventoryCheckDetail(@Valid MaterialInventoryCheckDetailSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除库存盘点明细
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteMaterialInventoryCheckDetail(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除库存盘点明细
|
||||
*
|
||||
* @param ids 编号
|
||||
*/
|
||||
void deleteMaterialInventoryCheckDetailListByIds(List<Long> ids);
|
||||
|
||||
/**
|
||||
* 获得库存盘点明细
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 库存盘点明细
|
||||
*/
|
||||
MaterialInventoryCheckDetailDO getMaterialInventoryCheckDetail(Long id);
|
||||
|
||||
/**
|
||||
* 获得库存盘点明细分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 库存盘点明细分页
|
||||
*/
|
||||
PageResult<MaterialInventoryCheckDetailDO> getMaterialInventoryCheckDetailPage(MaterialInventoryCheckDetailPageReqVO pageReqVO);
|
||||
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO;
|
||||
import com.zt.plat.framework.common.pojo.PageResult;
|
||||
import com.zt.plat.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckDetailMapper;
|
||||
|
||||
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
|
||||
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 库存盘点明细 Service 实现类
|
||||
*
|
||||
* @author 后台管理
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class MaterialInventoryCheckDetailServiceImpl implements MaterialInventoryCheckDetailService {
|
||||
|
||||
@Resource
|
||||
private MaterialInventoryCheckDetailMapper materialInventoryCheckDetailMapper;
|
||||
|
||||
@Override
|
||||
public MaterialInventoryCheckDetailRespVO createMaterialInventoryCheckDetail(MaterialInventoryCheckDetailSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
MaterialInventoryCheckDetailDO materialInventoryCheckDetail = BeanUtils.toBean(createReqVO, MaterialInventoryCheckDetailDO.class);
|
||||
materialInventoryCheckDetailMapper.insert(materialInventoryCheckDetail);
|
||||
// 返回
|
||||
return BeanUtils.toBean(materialInventoryCheckDetail, MaterialInventoryCheckDetailRespVO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMaterialInventoryCheckDetail(MaterialInventoryCheckDetailSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckDetailExists(updateReqVO.getId());
|
||||
// 更新
|
||||
MaterialInventoryCheckDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryCheckDetailDO.class);
|
||||
materialInventoryCheckDetailMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialInventoryCheckDetail(Long id) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckDetailExists(id);
|
||||
// 删除
|
||||
materialInventoryCheckDetailMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteMaterialInventoryCheckDetailListByIds(List<Long> ids) {
|
||||
// 校验存在
|
||||
validateMaterialInventoryCheckDetailExists(ids);
|
||||
// 删除
|
||||
materialInventoryCheckDetailMapper.deleteByIds(ids);
|
||||
}
|
||||
|
||||
private void validateMaterialInventoryCheckDetailExists(List<Long> ids) {
|
||||
List<MaterialInventoryCheckDetailDO> list = materialInventoryCheckDetailMapper.selectByIds(ids);
|
||||
if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
|
||||
throw exception(MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
private void validateMaterialInventoryCheckDetailExists(Long id) {
|
||||
if (materialInventoryCheckDetailMapper.selectById(id) == null) {
|
||||
throw exception(MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MaterialInventoryCheckDetailDO getMaterialInventoryCheckDetail(Long id) {
|
||||
return materialInventoryCheckDetailMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<MaterialInventoryCheckDetailDO> getMaterialInventoryCheckDetailPage(MaterialInventoryCheckDetailPageReqVO pageReqVO) {
|
||||
return materialInventoryCheckDetailMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user