zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
FCL
2025-11-19 17:31:46 +08:00
parent 3028d478fe c6c44828e0
commit a26327d4e7
29 changed files with 282 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java
View File

@@ -106,6 +106,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
return success(pageResult);
}
@GetMapping("/page-analysis-group")
@Operation(summary = "获得子样分析部门分页")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getAnalysisGroupPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getAnalysisGroupPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/page-stock")
@Operation(summary = "查询样品库分页数据")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> pageStock(@Valid BusinessSubSamplePageReqVO pageReqVO) {

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java
View File

@@ -40,8 +40,8 @@ public class SampleTaskAssignController {
}
@GetMapping("/getAssaySampleList")
public CommonResult<?> getAssaySampleList() {
List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList();
public CommonResult<?> getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) {
List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList(reqVO);
return success(list);
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
View File

@@ -107,4 +107,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "备注")
private String remark;
@Schema(description = "部门id")
private Long deptId;
}

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationPageReqVO.java
View File

@@ -151,6 +151,8 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
@Schema(description = "备注")
private String remark;
@Schema(description = "部门id")
private Long deptId;
//====================扩展字段======================
@Schema(description = "委托来源名称")
private String configEntrustSourceName;

35
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleExtendRespVO.java
View File

@@ -1,7 +1,9 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -17,6 +19,39 @@ public class BusinessSubSampleExtendRespVO extends BusinessSubSampleRespVO {
@Schema(description = "子样检测方法")
private List<BusinessAssayTaskDataExtendRespVO> businessAssayTaskDataList;
@Schema(description = "分析班组")
private List<BusinessSubSampleAnalysisGroupRespVO> businessSubSampleAnalysisGroupList;
@Schema(description = "样品去向")
private String sampleDestination;
public String getSampleDestination() {
String _sampleDestination = null;
if (CollUtil.isNotEmpty(this.businessSubSampleAnalysisGroupList)) {
List<String> collect = this.businessSubSampleAnalysisGroupList.stream().filter(f -> f.getSampleStatus().equals("待收样")).map(m -> m.getAssayDepartmentName()).collect(Collectors.toList());
_sampleDestination = CollUtil.join(collect, ",");
}
return _sampleDestination;
}
@Schema(description = "样品所在位置")
private String sampleLocation;
public String getSampleLocation() {
this.sampleLocation = null;
if (CollUtil.isNotEmpty(this.businessSubSampleAnalysisGroupList)) {
List<String> collect = this.businessSubSampleAnalysisGroupList.stream().filter(f -> f.getSampleStatus().equals("已收样")).map(m -> m.getAssayDepartmentName()).collect(Collectors.toList());
this.sampleLocation = CollUtil.join(collect, ",");
}
return this.sampleLocation;
}
@Schema(description = "分析部门id")
private Long assayDepartmentId;
@Schema(description = "分析部门名称")
private String assayDepartmentName;
@Schema(description = "是否打印")
private Integer isPrint;

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java
View File

@@ -1,8 +1,6 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import java.math.BigDecimal;
@@ -48,6 +46,9 @@ public class BusinessSubSamplePageReqVO extends PageParam {
@Schema(description = "归库编号")
private String sampleReturnCode;
@Schema(description = "是否已经生成归库编号,1-已生成，0-未生成")
private Integer isGenerateReturnCode;
@Schema(description = "是否称重,1-启用，0-不启用")
private Integer isWeighing;
@@ -132,6 +133,15 @@ public class BusinessSubSamplePageReqVO extends PageParam {
@Schema(description = "备注")
private String remark;
@Schema(description = "分析部门id")
private Long assayDepartmentId;
@Schema(description = "分析部门名称")
private String assayDepartmentName;
@Schema(description = "分析部门状态")
private String assayDepartmentStatus;
//扩展字段
@Schema(description = "库位编码")
private String warehouseLocationCode;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleReqVO.java
View File

@@ -47,6 +47,9 @@ public class BusinessSubSampleReqVO {
@Schema(description = "归库编号")
private String sampleReturnCode;
@Schema(description = "是否已经生成归库编号,1-已生成，0-未生成")
private Integer isGenerateReturnCode;
@Schema(description = "是否称重,1-启用，0-不启用")
private Integer isWeighing;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleRespVO.java
View File

@@ -62,6 +62,9 @@ public class BusinessSubSampleRespVO {
@ExcelProperty("归库编号")
private String sampleReturnCode;
@Schema(description = "是否已经生成归库编号,1-已生成，0-未生成")
private Integer isGenerateReturnCode;
@Schema(description = "是否称重,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否称重,1-启用，0-不启用")
private Integer isWeighing;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleSaveReqVO.java
View File

@@ -55,6 +55,9 @@ public class BusinessSubSampleSaveReqVO {
@Schema(description = "归库编号")
private String sampleReturnCode;
@Schema(description = "是否已经生成归库编号,1-已生成，0-未生成")
private Integer isGenerateReturnCode;
@Schema(description = "是否称重,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "是否称重,1-启用，0-不启用不能为空")
private Integer isWeighing;

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubSampleDO.java
View File

@@ -93,6 +93,11 @@ public class BusinessSubSampleDO extends BusinessBaseDO {
@TableField("SMP_RTN_CD")
private String sampleReturnCode;
/**
* 是否已经生成归库编号,1-已生成，0-未生成
*/
@TableField("IS_GEN_RTN_CD")
private Integer isGenerateReturnCode;
/**
* 是否称重,1-启用，0-不启用
*/
@TableField("IS_WG")

Some files were not shown because too many files have changed in this diff Show More