生成数据录入工作流测试用

src/dashoo.cn/backend/api/business/codecsequence/codecsequenceService.go

@@ -355,4 +355,12 @@ func (s *CodecSequenceService)GetDetailPressureGaugTestSequence(accCode string)
 	sequence := s.GetSequenceByName(accCode, seqName)
 	seqStr := "J计QY2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
+}
+
+//ben
+func (s *CodecSequenceService)GetDetailBenSequence(accCode string) string{
+	seqName := "BenAlertorTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J计QW7.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
 }

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -196,6 +196,9 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	case limsdoctemplate.DAYT_PRESSUREGAUGETEST_DETAIL:
 		//压力表检定
 		seqStr = codecSvc.GetDetailPressureGaugTestSequence(AccCode)
+	case limsdoctemplate.DAYT_BEN_DETAIL:
+		//ben
+		seqStr = codecSvc.GetDetailPressureGaugTestSequence(AccCode)
 	}
 	//根据分配人员创建多条数据录入记录
 	ConUserIdList := strings.Split(balancedata.ConUserId, ",")
@@ -227,6 +230,10 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 			processInstanceId=svcActiviti.StartProcess(workflow.TJZ_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 		case "100000151":
 			processInstanceId=svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+		case "100000168":
+			processInstanceId=svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+		case "100000169":
+			processInstanceId=svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 		}
 		dataentryentity.DocKey=processInstanceId
 		err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})

src/dashoo.cn/backend/api/business/limsdoctemplate/limstemplateenum.go

@@ -101,6 +101,10 @@ const (
 	DAYT_LIMSREPORTMOTOR_DETAIL string = "DAYT.LimsReportMotor.Detail"
 	// 电泵井
 	DAYT_LIMSREPORTELECPUMPWELL_DETAIL string = "DAYT.LimsReportElecPumpWell.Detail"
+	//Ben
+	DAYT_BEN_DETAIL string= "DAYT.Ben.Detail"
+	// 一氧化碳报警器
+	DAYT_CARBON_DETAIL string= "DAYT.Carbon.Detail"
 	//螺杆泵
 	DAYT_LIMSREPORTSCREWPUMP_DETAIL string = "DAYT.LimsReportScrewPump.Detail"
 	// 油田专用变压器

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -55,4 +55,6 @@ const (
 	YX_DATA_KEY string = "yx_data_apply"
 	//宇信报告
 	YX_PROCESS_KEY string = "yx_report_assign"
+	//计量数据录入
+	JL_DATA_KEY string = "jl_data_apply"
 )

src/dashoo.cn/backend/api/controllers/lims/limsentrust.go

@@ -701,6 +701,7 @@ func (this *LimsEnturstController) GetEntrustNo() {
 // @router /taskbalance/:id [post]
 func (this *LimsEnturstController) TaskBalance() {
 	id := this.Ctx.Input.Param(":id")
+	var err error
 	samplecode := this.GetString("samplecode")
 	var model limsbalance.LimsTaskBalance
 	var jsonblob = this.Ctx.Input.RequestBody
@@ -756,7 +757,7 @@ func (this *LimsEnturstController) TaskBalance() {
 				model.DataDoc = testlist[j].DataTemplateName
 				svc.InsertEntityBytbl(this.User.AccCode+LimsTaskBalanceName, &model)
 				//生成数据录入
-				svcBalance.CreateDataentry(this.User.AccCode, this.User.Id, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, model.Id, this.User.DepartmentId, id)
+				err = svcBalance.CreateDataentry(this.User.AccCode, this.User.Id, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, model.Id, this.User.DepartmentId, id)
 			}
 		}
 
@@ -764,7 +765,7 @@ func (this *LimsEnturstController) TaskBalance() {
 		entity.ModifiedBy = this.User.Realname
 		entity.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		var cols []string = []string{"EntrustStatus", "ModifiedUserId", "ModifiedBy"}
-		err := svc.UpdateEntityBywheretbl(this.User.AccCode+LimsEntrustMainName, &entity, cols, where)
+		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsEntrustMainName, &entity, cols, where)
 
 		if err == nil {
 			errinfo.Message = "操作成功！"