diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
index c675372..18ef3f0 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
@@ -333,7 +333,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 			//样品类型字典与委托一致
 			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.setSampleTime(currentDateTime);