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

样品生成，子样方法配置错误提示

Browse Source
This commit is contained in:
王兴荣
2025-12-24 13:55:21 +08:00
parent d9f7330f57
commit b0d45e5cde
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
View File

@@ -432,6 +432,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
//查询子样对应的分析方法 //查询子样对应的分析方法
ConfigSubSampleMethodExtendRespVO configSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getIsDefaultUse().equals(QmsCommonConstant.YES) && f.getConfigAssayMethodId().equals(configAssayMethodId) && f.getConfigSubSampleId().equals(configSubSample.getId())).findFirst().orElse(null); ConfigSubSampleMethodExtendRespVO configSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getIsDefaultUse().equals(QmsCommonConstant.YES) && f.getConfigAssayMethodId().equals(configAssayMethodId) && f.getConfigSubSampleId().equals(configSubSample.getId())).findFirst().orElse(null);
if (configSubSampleMethodDO == null) {
throw new ServiceException(1_032_100_000, "未找到子样对应的分析方法配置！");
}
//扩展配置信息 //扩展配置信息
String configInfomation = configSubSampleMethodDO.getConfigInfomation(); String configInfomation = configSubSampleMethodDO.getConfigInfomation();
if (StringUtils.isNotBlank(configInfomation)) { if (StringUtils.isNotBlank(configInfomation)) {

1
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
View File

@@ -25,6 +25,7 @@
WHERE WHERE
tbatd.DELETED = 0 tbatd.DELETED = 0
AND tcam.DELETED = 0 AND tcam.DELETED = 0
AND tbssag.DELETED = 0
AND tbatd.IS_ASN_TSKD = 0 AND tbatd.IS_ASN_TSKD = 0
AND tbatd.IS_RPOD = 0 AND tbatd.IS_RPOD = 0
AND tbssag.SMP_STS = '已收样' AND tbssag.SMP_STS = '已收样'

1
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
View File

@@ -103,6 +103,7 @@
T_BSN_SB_PRN_SMP_ASMT tbspsa T_BSN_SB_PRN_SMP_ASMT tbspsa
WHERE WHERE
tbspsa.IS_RPOD = 0 tbspsa.IS_RPOD = 0
AND tbspsa.DELETED = 0
AND tbspsa.CFG_ASY_MTHD_ID = #{reqVO.configAssayMethodId} AND tbspsa.CFG_ASY_MTHD_ID = #{reqVO.configAssayMethodId}
GROUP BY GROUP BY
tbspsa.BSN_SB_PRN_SMP_ID , tbspsa.BSN_SB_PRN_SMP_ID ,