From ce9aff55837a1dd76d7eb3f8e6b3acd3eeb11ec6 Mon Sep 17 00:00:00 2001 From: wxr Date: Tue, 27 Jan 2026 11:18:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=93=9C=E5=9B=BD=E8=B4=B8=E5=95=86?= =?UTF-8?q?=E6=A3=80=E5=A7=94=E6=89=98=E4=B9=9F=E6=8F=90=E5=89=8D=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A0=B7=E5=93=81=E7=BC=96=E5=8F=B7=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E6=9D=A5=E6=A0=B7=E7=BC=96=E5=8F=B7=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/liteflow/sample/entrust/SampleEntrustCreateDataCmp.java | 2 ++ .../bus/liteflow/sample/entrust/SampleEntrustUpdateDataCmp.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustCreateDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustCreateDataCmp.java index fc9912c..fbda893 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustCreateDataCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustCreateDataCmp.java @@ -115,6 +115,8 @@ public class SampleEntrustCreateDataCmp extends NodeComponent { } else if ("xsqywtzcwt".equals(configEntrustSource.getKey())) {//仲裁委托 String sampleCode = "ZW" + year + number + "-" + StringUtils.leftPad(businessSampleEntrustDetail.getSort().toString(), 2, "0"); businessSampleEntrustDetail.setSampleCode(sampleCode); + } else if ("ztgmwt".equals(configEntrustSource.getKey())) {//中铜国贸商检委托，来样编号与样品编号一致 + businessSampleEntrustDetail.setSampleCode(businessSampleEntrustDetail.getEntrustSampleCode());//样品编号与来样编号一致 } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustUpdateDataCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustUpdateDataCmp.java index 10d6ce5..a7cef38 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustUpdateDataCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustUpdateDataCmp.java @@ -115,6 +115,8 @@ public class SampleEntrustUpdateDataCmp extends NodeComponent { } else if ("xsqywtzcwt".equals(configEntrustSource.getKey())) {//仲裁委托 String sampleCode = "ZW" + year + number + "-" + StringUtils.leftPad(businessSampleEntrustDetail.getSort().toString(), 2, "0"); businessSampleEntrustDetail.setSampleCode(sampleCode); + } else if ("ztgmwt".equals(configEntrustSource.getKey())) {//中铜国贸商检委托，来样编号与样品编号一致 + businessSampleEntrustDetail.setSampleCode(businessSampleEntrustDetail.getEntrustSampleCode());//样品编号与来样编号一致 } }