离心泵

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

@@ -548,3 +548,11 @@ func (s *CodecSequenceService)GetDetailPistonPumpUnit(accCode string) string{
 	seqStr := "J能Q	P2.3—"+ strconv.Itoa(time.Now().Year()) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
 }
+
+// 离心泵数据录入
+func (s *CodecSequenceService)GetDetailLiquidTransportation(accCode string) string{
+	seqName := "DetailLiquidTransportation"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J能QP1.3—"+ strconv.Itoa(time.Now().Year()) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}

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

@@ -243,6 +243,9 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	case limsdoctemplate.DAYT_LIMSREPORTSCREWPUMP_DETAIL:
 		//螺杆泵数据录入
 		seqStr = codecSvc.GetDetailScrewPump(AccCode)
+	case limsdoctemplate.DAYT_LIQUIDTRANSPORTATION_DETAIL:
+		//离心泵数据录入
+		seqStr = codecSvc.GetDetailLiquidTransportation(AccCode)
 	}
 	//根据分配人员创建多条数据录入记录
 	ConUserIdList := strings.Split(balancedata.ConUserId, ",")

src/dashoo.cn/backend/api/business/limsreportliquidtransportation/limsreportliquidtransportationService.go

@@ -85,7 +85,7 @@ func (s *LimsReportLiquidTransportationService) DataToExcelReport(entrustMainEnt
 	etasys, err := strconv.ParseFloat(fmt.Sprintf("%.3f", rho*g*(h-h1)*q*math.Pow(10, -3)/pgr/100), 64) // 泵机组系统效率
 	etaj := 0.00                                                                                    // 节流损失率
 
-	datamap["pn	"] = pn
+	datamap["pn"] = pn
 	datamap["qn"] = qn
 	datamap["q"] = q
 	datamap["pgr"] = pgr
@@ -108,6 +108,7 @@ func (s *LimsReportLiquidTransportationService) DataToExcelReport(entrustMainEnt
 	datamap["etag"] = etag
 	datamap["h1"] = h1
 	datamap["etasys"] = etasys
+	datamap["cosphi"] = cosphi
 
 	if (etag >= limitval1) {
 		datamap["res1"] = "合格"
@@ -135,12 +136,16 @@ func (s *LimsReportLiquidTransportationService) DataToExcelReport(entrustMainEnt
 	datamap["jcnum"] = reportList[0].CreateOn.Format("2006-01-02")
 	datamap["jcdate"] = reportList[0].CreateOn.Format("2006年01月02日")
 	datamap["spec"] = reportList[0].Model1
-	//datamap["number"] = reportList[0].DeviceName
+	datamap["devno"] = reportList[0].DeviceName
 	datamap["place"] = reportList[0].InstalPosition
 	//datamap["instr"] = reportList[0].MonitoringInstrument
 	datamap["limit1"] = limitval1
 	datamap["limit2"] = limitval2
 	datamap["limit3"] = limitval3
+
+	datamap["bjxh"] = limitval3  // 电机型号
+
+
 	reportUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
 
 	return reportUrl, err

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

@@ -36,8 +36,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://localhost:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
-	//s.OriginUrl = "http://localhost:8081/api"
-	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	s.OriginUrl = "http://localhost:8081/api"
+	//s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
 	//s.AposeUrl = "http://localhost:8081/api/apose"
 	//s.AposeUrl = "http://192.168.0.171:8081/api/apose"
 	s.Username = "leader"