分配任务是添加是否配料

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

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

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

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

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

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

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