具体模板数据录入修改

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://192.168.0.171:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
-	s.OriginUrl = "http://localhost:8081/api"
+	s.OriginUrl = "http://192.168.0.166: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/casbin/role.go

@@ -530,3 +530,24 @@ func (this *RoleController) RoleEditPost() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 权限
+// @Description 通过角色权限获取用户列表
+// @Success 200 {object} controllers.Request
+// @router /getUsersWithRolePermission [get]
+func (this *RoleController) GetUsersWithRolePermissionAjax() {
+	perCode := this.GetString("perCode")
+	svc := permission.GetPermissionService(utils.DBE)
+	perId := svc.GetPermissionId(perCode)
+	var errinfo ErrorInfo
+	if perId == "" {
+		errinfo.Message = utils.AlertProcess("权限代码错误")
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	//users := svc.GetRolePermissionUserids(this.User.Id, perId, this.User.AccCode)
+	//this.Data["json"] = users
+	this.ServeJSON()
+}

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalercarbon.go

@@ -318,6 +318,9 @@ func (this *LimsReportAlerCarbonController) UpdatecarbonEntity() {
 	svc := limsreportalercarbon.GetlimsReportAlerCarbonSessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerfhgas.go

@@ -87,6 +87,9 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportalerfhgas.GetLimsReportAlerFHSessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -124,7 +127,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -144,7 +147,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -163,7 +166,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -182,7 +185,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
 			avalentity.EId = model.EId
 			avalentity.TaskBalanceId = model.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -203,7 +206,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -223,7 +226,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -244,7 +247,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -268,7 +271,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -316,6 +319,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 	svc := limsreportalerfhgas.GetLimsReportAlerFHSessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -407,6 +413,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			}else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -442,6 +451,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -476,6 +488,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 			}else {
 				if avalentity.AlertFunction != "" || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.ActionValue != 0 {
+					avalentity.EId = model.EId
+					avalentity.TaskBalanceId = model.TaskBalanceId
+					avalentity.DataEntryId = model.BenMainform.DataEntryId
 					avalentity.CreateOn = time.Now()
 					avalentity.CreateBy = this.User.Realname
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -514,6 +529,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -549,6 +567,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -591,6 +612,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -635,6 +659,9 @@ func (this *LimsReportAlerFHController) UpdatefhEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerkrgas.go

@@ -87,6 +87,9 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportalerkrgas.GetLimsReportAlerKRSessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -124,7 +127,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -144,7 +147,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -164,7 +167,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -183,7 +186,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
 			avalentity.EId = model.EId
 			avalentity.TaskBalanceId = model.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -205,7 +208,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -224,7 +227,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -245,7 +248,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -269,7 +272,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -315,6 +318,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 	svc := limsreportalerkrgas.GetLimsReportAlerKRSessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -405,6 +411,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -442,6 +451,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	}else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -477,6 +489,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 					err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 				}else {
 					if avalentity.AlertFunction != "" || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.ActionValue != 0 {
+						avalentity.EId = model.EId
+						avalentity.TaskBalanceId = model.TaskBalanceId
+						avalentity.DataEntryId = model.BenMainform.DataEntryId
 						avalentity.CreateOn = time.Now()
 						avalentity.CreateBy = this.User.Realname
 						avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -517,6 +532,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -552,6 +570,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -594,6 +615,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -637,6 +661,9 @@ func (this *LimsReportAlerKRController) UpdatekrEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal1carbonredgas.go

@@ -99,6 +99,9 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportanal1carbonredgas.GetLimsReportAlCarbon1SessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -136,7 +139,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -156,7 +159,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -176,7 +179,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -195,7 +198,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 			avalentity.OtherValue = model.AlertOtherList[i].OtherValue
 			avalentity.EId = model.EId
 			avalentity.TaskBalanceId = model.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -217,7 +220,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -236,7 +239,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -257,7 +260,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -281,7 +284,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -326,6 +329,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 	svc := limsreportanal1carbonredgas.GetLimsReportAlCarbon1SessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -416,6 +422,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -453,6 +462,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -489,6 +501,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity, alvalcols, alwhere)
 			} else {
 				if avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.OtherValue != 0 {
+					avalentity.EId = model.EId
+					avalentity.TaskBalanceId = model.TaskBalanceId
+					avalentity.DataEntryId = model.BenMainform.DataEntryId
 					avalentity.CreateOn = time.Now()
 					avalentity.CreateBy = this.User.Realname
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -527,6 +542,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -561,6 +579,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -603,6 +624,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -646,6 +670,9 @@ func (this *LimsReportAnCarbon1Controller) Updatecarbon1Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal2carbonredgas.go

@@ -88,6 +88,9 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportanal2carbonredgas.GetLimsReportAlCarbon2SessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -125,7 +128,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -145,7 +148,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -164,7 +167,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -183,7 +186,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 			avalentity.OtherValue = model.AlertOtherList[i].OtherValue
 			avalentity.EId = model.EId
 			avalentity.TaskBalanceId = model.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -205,7 +208,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -224,7 +227,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -245,7 +248,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -269,7 +272,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -316,6 +319,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 	svc := limsreportanal2carbonredgas.GetLimsReportAlCarbon2SessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -406,6 +412,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -478,6 +487,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorOtherName, &avalentity, alvalcols, alwhere)
 			} else {
 				if avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.OtherValue != 0 {
+					avalentity.EId = model.EId
+					avalentity.TaskBalanceId = model.TaskBalanceId
+					avalentity.DataEntryId = model.BenMainform.DataEntryId
 					avalentity.CreateOn = time.Now()
 					avalentity.CreateBy = this.User.Realname
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -515,6 +527,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			}else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -550,6 +565,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		}else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -592,6 +610,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		}else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -636,6 +657,9 @@ func (this *LimsReportAlerCarbon2Controller) Updatecarbon2Entity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			}else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetHSgas.go

@@ -87,6 +87,9 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportdetHSgas.GetLimsReportDetHsSessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -124,7 +127,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -144,7 +147,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -164,7 +167,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -184,7 +187,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 			avalentity.AllowValue = model.AlertValArrayList[i].AllowValue
 			avalentity.EId = model.EId
 			avalentity.TaskBalanceId = model.TaskBalanceId
-			avalentity.DataEntryId = dataentrymodel.Id
+			avalentity.DataEntryId = model.BenMainform.DataEntryId
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
 			avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -206,7 +209,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -226,7 +229,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -247,7 +250,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -271,7 +274,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -318,6 +321,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 	svc := limsreportdetHSgas.GetLimsReportDetHsSessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -407,6 +413,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -443,6 +452,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -479,6 +491,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity, alvalcols, alwhere)
 			} else {
 				if avalentity.SureValue != 0 || avalentity.Value1 != 0 || avalentity.Value2 != 0 || avalentity.Value3 != 0 || avalentity.MaxValue != 0 || avalentity.AllowValue != 0 {
+					avalentity.EId = model.EId
+					avalentity.TaskBalanceId = model.TaskBalanceId
+					avalentity.DataEntryId = model.BenMainform.DataEntryId
 					avalentity.CreateOn = time.Now()
 					avalentity.CreateBy = this.User.Realname
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -516,6 +531,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.Deviation != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -550,6 +568,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -592,6 +613,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		} else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -635,6 +659,9 @@ func (this *LimsReportDeHSController) UpdatehsEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			} else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetelectoxygen.go

@@ -87,6 +87,9 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
 	svc := limsreportdetelectoxygen.GetLimsReportOxygenSessionService(sessions)
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -124,7 +127,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	almodel.DielecStrength = model.BenMainform.DielecStrength
 	almodel.EId = model.EId
 	almodel.TaskBalanceId = model.TaskBalanceId
-	almodel.DataEntryId = dataentrymodel.Id
+	almodel.DataEntryId = model.BenMainform.DataEntryId
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
 	almodel.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -144,7 +147,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
 			cerentity.EId = model.EId
 			cerentity.TaskBalanceId = model.TaskBalanceId
-			cerentity.DataEntryId = dataentrymodel.Id
+			cerentity.DataEntryId = model.BenMainform.DataEntryId
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
 			cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -164,7 +167,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	cerentity2.StanDevice = model.StanDevice
 	cerentity2.EId = model.EId
 	cerentity2.TaskBalanceId = model.TaskBalanceId
-	cerentity2.DataEntryId = dataentrymodel.Id
+	cerentity2.DataEntryId = model.BenMainform.DataEntryId
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
 	cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -183,7 +186,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	//		avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
 	//		avalentity.EId = model.EId
 	//		avalentity.TaskBalanceId = model.TaskBalanceId
-	//		avalentity.DataEntryId = dataentrymodel.Id
+	//		avalentity.DataEntryId = model.BenMainform.DataEntryId
 	//		avalentity.CreateOn = time.Now()
 	//		avalentity.CreateBy = this.User.Realname
 	//		avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -204,7 +207,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
 			devientity.EId = model.EId
 			devientity.TaskBalanceId = model.TaskBalanceId
-			devientity.DataEntryId = dataentrymodel.Id
+			devientity.DataEntryId = model.BenMainform.DataEntryId
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
 			devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -223,7 +226,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
 	reponseentity.EId = model.EId
 	reponseentity.TaskBalanceId = model.TaskBalanceId
-	reponseentity.DataEntryId = dataentrymodel.Id
+	reponseentity.DataEntryId = model.BenMainform.DataEntryId
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
 	reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -244,7 +247,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
 	repeatentity.EId = model.EId
 	repeatentity.TaskBalanceId = model.TaskBalanceId
-	repeatentity.DataEntryId = dataentrymodel.Id
+	repeatentity.DataEntryId = model.BenMainform.DataEntryId
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
 	repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -268,7 +271,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
 			shiftentity.EId = model.EId
 			shiftentity.TaskBalanceId = model.TaskBalanceId
-			shiftentity.DataEntryId = dataentrymodel.Id
+			shiftentity.DataEntryId = model.BenMainform.DataEntryId
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
 			shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -316,6 +319,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 	svc := limsreportdetelectoxygen.GetLimsReportOxygenSessionService(sessions)
 	var dataentrymodel limsdataentry.LimsDateEntry
 	var almodel limsreportalertor.LimsReportAlertor
+	model.Id = model.BenMainform.DataEntryId
+	model.EId = model.BenMainform.EId
+	model.TaskBalanceId = model.BenMainform.TaskBalanceId
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.CustomerName = model.BenMainform.CustomerName
@@ -406,6 +412,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity, cercols, alwhere)
 			} else {
 				if cerentity.CerNum != "" || cerentity.StandardUnit != "" || cerentity.StandVal != "" || cerentity.Uncertainty != "" || cerentity.InstrumentNo != "" || cerentity.StanDevice != "" {
+					cerentity.EId = model.EId
+					cerentity.TaskBalanceId = model.TaskBalanceId
+					cerentity.DataEntryId = model.BenMainform.DataEntryId
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -443,6 +452,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 		err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2, cer2cols, alwhere)
 	} else {
 		if cerentity2.CerNum != "" || cerentity2.StandardUnit != "" || cerentity2.StandVal != "" || cerentity2.Uncertainty != "" || cerentity2.InstrumentNo != "" || cerentity2.StanDevice != "" {
+			cerentity2.EId = model.EId
+			cerentity2.TaskBalanceId = model.TaskBalanceId
+			cerentity2.DataEntryId = model.BenMainform.DataEntryId
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -503,6 +515,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity, devicols, alwhere)
 			} else {
 				if devientity.GasValue != 0 || devientity.Value1 != 0 || devientity.Value2 != 0 || devientity.Value3 != 0 || devientity.AvgValue != 0 || devientity.DeviationRelative != 0 || devientity.DeviationAbs != 0 {
+					devientity.EId = model.EId
+					devientity.TaskBalanceId = model.TaskBalanceId
+					devientity.DataEntryId = model.BenMainform.DataEntryId
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -538,6 +553,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity, responcols, alwhere)
 		} else {
 			if reponseentity.GasValue != 0 || reponseentity.Value1 != 0 || reponseentity.Value2 != 0 || reponseentity.Value3 != 0 || reponseentity.Deviation != 0 {
+				reponseentity.EId = model.EId
+				reponseentity.TaskBalanceId = model.TaskBalanceId
+				reponseentity.DataEntryId = model.BenMainform.DataEntryId
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -580,6 +598,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 			err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity, repeacols, alwhere)
 		} else {
 			if repeatentity.GasValue != 0 || repeatentity.Value1 != 0 || repeatentity.Value2 != 0 || repeatentity.Value3 != 0 || repeatentity.Value4 != 0 || repeatentity.Value5 != 0 || repeatentity.Value6 != 0 || repeatentity.AvgValue != 0 || repeatentity.RepeatValue != 0 {
+				repeatentity.EId = model.EId
+				repeatentity.TaskBalanceId = model.TaskBalanceId
+				repeatentity.DataEntryId = model.BenMainform.DataEntryId
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -623,6 +644,9 @@ func (this *LimsReportDeOxygenController) UpdateoxygenEntity() {
 				err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity, shiftcols, alwhere)
 			} else {
 				if shiftentity.Value0 != 0 || shiftentity.Value1 != 0 || shiftentity.Value2 != 0 || shiftentity.Value3 != 0 || shiftentity.Value4 != 0 || shiftentity.Value5 != 0 || shiftentity.Value6 != 0 || shiftentity.ZeroValue != 0 || shiftentity.ShowValue != 0 {
+					shiftentity.EId = model.EId
+					shiftentity.TaskBalanceId = model.TaskBalanceId
+					shiftentity.DataEntryId = model.BenMainform.DataEntryId
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()