样品编号生成修改,如果配置了样品编号生成规则,则以规则生成的为准,否则样品编号就为来样编号
This commit is contained in:
@@ -333,7 +333,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
|
|||||||
//样品类型字典与委托一致
|
//样品类型字典与委托一致
|
||||||
businessBaseSampleDO.setDictionaryBusinessId(businessSampleEntrustDetailDO.getSampleTypeDictionaryBusinessId());
|
businessBaseSampleDO.setDictionaryBusinessId(businessSampleEntrustDetailDO.getSampleTypeDictionaryBusinessId());
|
||||||
//生成样品编号
|
//生成样品编号
|
||||||
String sampleCode = sequenceUtil.genCode(configBaseSample.getCodeRule());
|
String sampleCode = businessSampleEntrustDetailDO.getEntrustSampleCode();//默认取来样编号
|
||||||
|
if (StringUtils.isNotBlank(configBaseSample.getCodeRule())) {//如果配置了样品编号生成规则,则以生成规则为准
|
||||||
|
sampleCode = sequenceUtil.genCode(configBaseSample.getCodeRule());
|
||||||
|
}
|
||||||
businessBaseSampleDO.setSampleCode(sampleCode);
|
businessBaseSampleDO.setSampleCode(sampleCode);
|
||||||
//样品生成时间为当前时间
|
//样品生成时间为当前时间
|
||||||
businessBaseSampleDO.setSampleTime(currentDateTime);
|
businessBaseSampleDO.setSampleTime(currentDateTime);
|
||||||
|
|||||||
Reference in New Issue
Block a user