螺杆泵

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

@@ -477,10 +477,26 @@ func (s *CodecSequenceService)GetReportPistonPumpUnit(accCode string) string{
 	return seqStr
 }
 
-// 螺杆泵
+// 螺杆泵数据录入
 func (s *CodecSequenceService)GetReportScrewPump(accCode string) string{
 	seqName := "PistonScrewPump"
 	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J能QC3.1-"+ strconv.Itoa(time.Now().Year()) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+// 螺杆泵监测报告
+func (s *CodecSequenceService)GetDetailScrewPump(accCode string) string{
+	seqName := "DetailScrewPump"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J能QC3.3—"+ strconv.Itoa(time.Now().Year()) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+// 螺杆泵
+func (s *CodecSequenceService)GetReportScrewPumpJS(accCode string) string{
+	seqName := "PistonScrewPumpJS"
+	sequence := s.GetSequenceByName(accCode, seqName)
 	seqStr := "J能QC3.2-"+ strconv.Itoa(time.Now().Year()) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
 }

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

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

src/dashoo.cn/backend/api/business/limsreportscrewpump/limsreportscrewpumpService.go

@@ -24,7 +24,7 @@ func GetLimsReportScrewPumpService(xormEngine *xorm.Engine) *LimsReportScrewPump
 /**
  * 生成报告
  */
-func (s *LimsReportScrewPumpService) DataToExcelReport(entrustMainEntity limsentrust.LimsEntrustMain, dateentryname string, createreportname string,tablename string, seqStr string, retUrl string, entrustId string, dataentryIds string) (reportUrl string, err error) {
+func (s *LimsReportScrewPumpService) DataToExcelReport(entrustMainEntity limsentrust.LimsEntrustMain, dateentryname string, createreportname string,tablename string, seqStr string, seqStrJS string, retUrl string, entrustId string, dataentryIds string) (reportUrl string, err error) {
 	var reportList []LimsReportScrewPump
 	s.GetEntitysByOrderbyWhere(tablename, "DataEntryId in ("+dataentryIds+")", "DataEntryId", &reportList)
 	//模板下载到服务器
@@ -73,21 +73,21 @@ func (s *LimsReportScrewPumpService) DataToExcelReport(entrustMainEntity limsent
 	datamap["po"] = po
 	datamap["pt"] = pt
 	datamap["q"] = q
-	datamap["pdr"] = pdr
+	datamap["pdr1"] = pdr
 	datamap["cosphi"] = cosphi
-	datamap["lb"] = lb
+	datamap["lb1"] = lb
 	datamap["h"] = cosphi
 	datamap["etaxt"] = etaxt
 
 	if (etaxt >= limitval1) {
-		datamap["result1"] = "合格"
+		datamap["res1"] = "合格"
 	} else {
-		datamap["result1"] = "不合格"
+		datamap["res1"] = "不合格"
 	}
 	if (cosphi >= limitval2) {
-		datamap["result2"] = "合格"
+		datamap["res2"] = "合格"
 	} else {
-		datamap["result2"] = "不合格"
+		datamap["res2"] = "不合格"
 	}
 
 
@@ -96,12 +96,16 @@ func (s *LimsReportScrewPumpService) DataToExcelReport(entrustMainEntity limsent
 	datamap["jcnum"] = reportList[0].CreateOn.Format("2006-01-02")
 	datamap["jcdate"] =  reportList[0].CreateOn.Format("2006年01月02日")
 	datamap["spec"] = reportList[0].PumpModel
-	//datamap["number"] = reportList[0].DeviceName
+	datamap["number"] = reportList[0].PumpModel
 	datamap["place"] = reportList[0].PositionCheck
 	datamap["instr"] = reportList[0].MonitoringInstrument
-	datamap["evalva1"] = 35
-	datamap["limitval1"] = limitval1
-	datamap["limitval2"] = limitval2
+	//datamap["evalva1"] = 35
+	//datamap["limitval1"] = limitval1
+	//datamap["limitval2"] = limitval2
+
+	datamap["seqStrJS"] = seqStrJS
+	datamap["djqe"] = reportList[0].MotorRatedPower
+
 	reportUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
 
 	return  reportUrl, err

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

@@ -36,7 +36,7 @@ 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://192.168.0.166:8081/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"

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

@@ -1007,8 +1007,9 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 		// 螺杆泵节能监测
 		codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
 		seqStr := codecSvc.GetReportScrewPump(this.User.AccCode)
+		seqStrJS := codecSvc.GetReportScrewPumpJS(this.User.AccCode)
 		svc := limsreportscrewpump.GetLimsReportScrewPumpService(utils.DBE)
-		reportUrl, err = svc.DataToExcelReport(entrustMain, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportScrewPumpName, seqStr, docTemplate.FileURL, entrustId, dataentryIds)
+		reportUrl, err = svc.DataToExcelReport(entrustMain, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, this.User.AccCode+LimsReportScrewPumpName, seqStr, seqStrJS, docTemplate.FileURL, entrustId, dataentryIds)
 	case limsdoctemplate.DAYT_LIQUIDTRANSPORTATION_REPORT:
 		// 离心泵机组
 		codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)