pm模块bug修正

models/pm/Service.model.go

@@ -33,12 +33,12 @@ type Service struct {
 	MaintByHourToggle    bool          `xorm:"bit 'MaintByHourToggle' not null" json:"PM_Service-MaintByHourToggle"`
 	DueHourInterval      int           `xorm:"int 'DueHourInterval' not null" json:"PM_Service-DueHourInterval"`
 	NodifyHours          int           `xorm:"int 'NodifyHours' not null" json:"PM_Service-NodifyHours"`
-	DueHourOn            grmi.Date     `xorm:"date 'DueHourOn'" json:"PM_Service-DueHourOn"`
+	DueHourOn            grmi.DateTime     `xorm:"date 'DueHourOn'" json:"PM_Service-DueHourOn"`
 	MaintByMileageToggle bool          `xorm:"bit 'MaintByMileageToggle' not null" json:"PM_Service-MaintByMileageToggle"`
 	DueMileageInterval   int           `xorm:"int 'DueMileageInterval' not null" json:"PM_Service-DueMileageInterval"`
 	NodifyMileages       int           `xorm:"int 'NodifyMileages' not null" json:"PM_Service-NodifyMileages"`
 	DueMileageAt         int           `xorm:"int 'DueMileageAt' not null" json:"PM_Service-DueMileageAt"`
-	NeedSchedule         int           `xorm:"int 'NeedSchedule' not null" json:"PM_Service-NeedSchedule"`
+	NeedScheduleToggle   bool          `xorm:"int 'NeedScheduleToggle' not null" json:"PM_Service-NeedScheduleToggle"`
 	MainTimeLen          float64       `xorm:"decimal 'MainTimeLen' not null" json:"PM_Service-MainTimeLen"`
 	TimeUnit             string        `xorm:"varchar(5) 'TimeUnit' not null" json:"PM_Service-TimeUnit"`
 	SchedType            string        `xorm:"varchar(14) 'SchedType' not null" json:"PM_Service-SchedType"`

models/pm/ServiceAttrLst.model.go

@@ -30,6 +30,7 @@ type ServiceAttrLst struct {
 	LastModify    grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"PM_ServiceAttrLst-LastModify"`
 	LastUser      string        `xorm:"nvarchar(20) 'LastUser' not null" json:"PM_ServiceAttrLst-LastUser"`
 	CreateTime    grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"PM_ServiceAttrLst-CreateTime"`
+	Attrname      string `json:"PM_ServiceAttrLst-Attrname" xorm:"-"`
 }
 
 /******************************************************************************

services/pm/implments/Service.service.impl.go

@@ -3,12 +3,14 @@
 package implments
 
 import (
+	baseDal "LAPP_ACURA_MOM_BACKEND/dao/base"
 	dal "LAPP_ACURA_MOM_BACKEND/dao/pm"
 	"LAPP_ACURA_MOM_BACKEND/db"
 	"LAPP_ACURA_MOM_BACKEND/global"
 	"LAPP_ACURA_MOM_BACKEND/grmi"
 	meta "LAPP_ACURA_MOM_BACKEND/meta/pm"
 	model "LAPP_ACURA_MOM_BACKEND/models/pm"
+	"LAPP_ACURA_MOM_BACKEND/utils"
 )
 
 /******************************************************************************
@@ -110,6 +112,10 @@ func (impl *ServiceServiceImplement) InsertOne(user *global.User, entity *model.
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	err := session.Begin()
+	if err != nil {
+		return err
+	}
 	dao := dal.NewServiceDAO(session, user.PlantNr, user.UserId)
 	record, err := dao.SelectOne(entity.MainServiceNr)
 	if err != nil {
@@ -118,10 +124,48 @@ func (impl *ServiceServiceImplement) InsertOne(user *global.User, entity *model.
 	if record != nil {
 		return grmi.NewBusinessError("已经存在相同主键的记录!")
 	}
+
+	snrDao := baseDal.NewSnrDAO(session, user.PlantNr, user.UserId)
+	Serviceid, err := snrDao.GetNextSnr("Serviceid")
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	entity.MainServiceNr = utils.ValueToInt(Serviceid,0)
+
 	err = dao.InsertOne(entity)
 	if err != nil {
+		session.Rollback()
 		return err
 	}
+
+	//批量插入
+	alldata := make([]model.ServiceAttrLst, 0)
+	for k, v := range entity.Valst {
+		one := model.ServiceAttrLst{}
+		one.PlantNr = entity.PlantNr
+		one.MainServiceNr = entity.MainServiceNr
+		one.Pos = k + 1
+		one.AttrNr = v.AttrNr
+		one.Descr = v.Descr
+		one.Attrname = v.AttrName
+		one.Parameter = v.Parameter
+		one.CreateTime = entity.CreateTime
+		one.LastUser = entity.LastUser
+		one.LastModify = entity.LastModify
+		alldata = append(alldata, one)
+	}
+	dao_asset_templatelst := dal.NewServiceAttrLstDAO(session, user.PlantNr, user.UserId)
+	err = dao_asset_templatelst.Insert(&alldata)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	err = session.Commit()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -137,6 +181,10 @@ func (impl *ServiceServiceImplement) DeleteOne(user *global.User, mainServiceNr
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	err := session.Begin()
+	if err != nil {
+		return err
+	}
 	dao := dal.NewServiceDAO(session, user.PlantNr, user.UserId)
 	record, err := dao.SelectOne(mainServiceNr)
 	if err != nil {
@@ -146,6 +194,18 @@ func (impl *ServiceServiceImplement) DeleteOne(user *global.User, mainServiceNr
 		return grmi.NewBusinessError("不存在指定记录!")
 	}
 	err = dao.DeleteOne(mainServiceNr)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+
+	dao_asset_templatelst := dal.NewServiceAttrLstDAO(session, user.PlantNr, user.UserId)
+	err = dao_asset_templatelst.DeleteWhere([]grmi.Predicate{meta.ServiceAttrLst_PlantNr.NewPredicate(grmi.Equal, record.PlantNr), meta.ServiceAttrLst_MainServiceNr.NewPredicate(grmi.Equal, record.MainServiceNr)})
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	err = session.Commit()
 	if err != nil {
 		return err
 	}
@@ -184,6 +244,10 @@ func (impl *ServiceServiceImplement) UpdateOne(user *global.User, entity *model.
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	err := session.Begin()
+	if err != nil {
+		return err
+	}
 	dao := dal.NewServiceDAO(session, user.PlantNr, user.UserId)
 	record, err := dao.SelectOne(entity.MainServiceNr)
 	if err != nil {
@@ -196,6 +260,39 @@ func (impl *ServiceServiceImplement) UpdateOne(user *global.User, entity *model.
 	if err != nil {
 		return err
 	}
+	dao_asset_templatelst := dal.NewServiceAttrLstDAO(session, user.PlantNr, user.UserId)
+	err = dao_asset_templatelst.DeleteWhere([]grmi.Predicate{meta.ServiceAttrLst_PlantNr.NewPredicate(grmi.Equal, record.PlantNr), meta.ServiceAttrLst_MainServiceNr.NewPredicate(grmi.Equal, record.MainServiceNr)})
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	//批量插入
+	alldata := make([]model.ServiceAttrLst, 0)
+	for k, v := range entity.Valst {
+		one := model.ServiceAttrLst{}
+		one.PlantNr = entity.PlantNr
+		one.MainServiceNr = entity.MainServiceNr
+		one.Pos = k + 1
+		one.AttrNr = v.AttrNr
+		one.Descr = v.Descr
+		one.Attrname = v.AttrName
+		one.Parameter = v.Parameter
+		one.CreateTime = entity.CreateTime
+		one.LastUser = entity.LastUser
+		one.LastModify = entity.LastModify
+		alldata = append(alldata, one)
+	}
+
+	err = dao_asset_templatelst.Insert(&alldata)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	err = session.Commit()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

task/task.go

@@ -76,7 +76,7 @@ func CreateOrder() {
 			dataone.TaskType = "B" //B是按照小时维护
 		} else if v.Service.MaintByMileageToggle {
 			dataone.TaskType = "C" //C是按照仪表值维护
-		} else if v.Service.NeedSchedule > 0 {
+		} else if v.Service.NeedScheduleToggle {
 			dataone.TaskType = "D" //D是按照调度维护
 		} else {
 			continue