From 80a932e80298835d35233de8ded167b0de904e34 Mon Sep 17 00:00:00 2001 From: wxr Date: Sun, 4 Jan 2026 11:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=93=81=E7=BC=96=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BA=86=E6=A0=B7=E5=93=81=E7=BC=96=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=EF=BC=8C=E5=88=99=E4=BB=A5=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=94=9F=E6=88=90=E7=9A=84=E4=B8=BA=E5=87=86=EF=BC=8C?= =?UTF-8?q?=E5=90=A6=E5=88=99=E6=A0=B7=E5=93=81=E7=BC=96=E5=8F=B7=E5=B0=B1?= =?UTF-8?q?=E4=B8=BA=E6=9D=A5=E6=A0=B7=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/entrust/SampleEntrustGenSampleDataCmp.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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);