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

Compare commits

base: zgty:520e5a9add7f320e526f4f97435a6bb302c6f7c2
Branches Tags
zgty:test zgty:lims_dev
...
compare: zgty:d1c26d70f6b9a6f19dbca4234eb79b12a3b5b167
Branches Tags
zgty:test zgty:lims_dev

4 Commits
520e5a9add ... d1c26d70f6

Author SHA1 Message Date
wxr
d1c26d70f6 分配任务是添加是否配料 2026-01-05 15:46:15 +08:00
wxr
e179cbdd0d Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-04 17:35:15 +08:00
wxr
0a9348cd60 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-04 11:01:16 +08:00
wxr
80a932e802 样品编号生成修改，如果配置了样品编号生成规则，则以规则生成的为准，否则样品编号就为来样编号 2026-01-04 11:01:07 +08:00
4 changed files with 10 additions and 1 deletions
Expand all files Collapse all files

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

@@ -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);

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java
View File

@@ -98,6 +98,8 @@ public class SampleTaskAssignManualCmp extends NodeComponent {
businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
businessAssayTaskDO.setIngredientsStatus("initial");
businessAssayTaskDO.setTaskAssignOperator(loginRealname);
businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java
View File

@@ -103,6 +103,8 @@ public class SampleTaskAssignMethodCmp extends NodeComponent {
businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName());
businessAssayTaskDO.setAssayOperatorId(assignAssayUser.getUserId());
businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
businessAssayTaskDO.setIngredientsStatus("initial");
businessAssayTaskDO.setTaskAssignOperator(loginRealname);
businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java
View File

@@ -98,6 +98,8 @@ public class SampleTaskAssignSampleCmp extends NodeComponent {
businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
businessAssayTaskDO.setIsIngredients(configAssayMethod.getIsIngredients());
businessAssayTaskDO.setIngredientsStatus("initial");
businessAssayTaskDO.setTaskAssignOperator(loginRealname);
businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId());