设备ID

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

@@ -547,6 +547,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			elegroudmodel.EId = entrustmainId
 			elegroudmodel.TaskBalanceId = balanceid
 			elegroudmodel.DataEntryId = dataentryid
+			elegroudmodel.DeviceId = entrustenquipment[i].DeviceId
+			elegroudmodel.DeviceName = entrustenquipment[i].DeviceName
 			elegroudmodel.OrderNo = entrustenquipment[i].OrderNo
 			elegroudmodel.PositionCheckId = entrustenquipment[i].PositionCheckId
 			elegroudmodel.PositionCheck = entrustenquipment[i].PositionCheck
@@ -565,6 +567,7 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			equipotentmodel.TaskBalanceId = balanceid
 			equipotentmodel.DataEntryId = dataentryid
 			equipotentmodel.OrderNo = entrustenquipment[i].OrderNo
+			equipotentmodel.DeviceId = entrustenquipment[i].DeviceId
 			equipotentmodel.PositionCheckId = entrustenquipment[i].PositionCheckId
 			equipotentmodel.PositionCheck = entrustenquipment[i].PositionCheck
 			equipotentmodel.District = entrustenquipment[i].Position
@@ -582,6 +585,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			lightprotect.TaskBalanceId = balanceid
 			lightprotect.DataEntryId = dataentryid
 			lightprotect.OrderNo = entrustenquipment[i].OrderNo
+			lightprotect.DeviceId = entrustenquipment[i].DeviceId
+			lightprotect.DeviceName = entrustenquipment[i].DeviceName
 			lightprotect.PositionCheckId = entrustenquipment[i].PositionCheckId
 			lightprotect.PositionCheck = entrustenquipment[i].PositionCheck
 			lightprotect.District = entrustenquipment[i].Position
@@ -599,6 +604,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			leakprotect.TaskBalanceId = balanceid
 			leakprotect.DataEntryId = dataentryid
 			leakprotect.OrderNo = entrustenquipment[i].OrderNo
+			leakprotect.DeviceId = entrustenquipment[i].DeviceId
+			leakprotect.DeviceName = entrustenquipment[i].DeviceName
 			leakprotect.PositionCheckId = entrustenquipment[i].PositionCheckId
 			leakprotect.PositionCheck = entrustenquipment[i].PositionCheck
 			leakprotect.Position = entrustenquipment[i].Position

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

@@ -18,6 +18,8 @@ type LimsReportElecGround struct {
 	TestDepart         string    `xorm:"comment('受检单位') VARCHAR(255)"`
 	District           string    `xorm:"comment('分布区域') VARCHAR(255)"`
 	OrderNo            int       `xorm:"comment('序号') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10)"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(50)"`
 	Position           string    `xorm:"comment('装置部位名称') VARCHAR(50)"`
 	GroundType         string    `xorm:"comment('接地类型') VARCHAR(50)"`
 	LinkStatus         string    `xorm:"comment('装置及连接状况') VARCHAR(50)"`

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

@@ -18,6 +18,7 @@ type LimsReportEquipotent struct {
 	TestDepart         string    `xorm:"comment('受检单位') VARCHAR(255)"`
 	District           string    `xorm:"comment('分布区域') VARCHAR(255)"`
 	OrderNo            int       `xorm:"comment('序号') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10)"`
 	DeviceName         string    `xorm:"comment('设施名称') VARCHAR(50)"`
 	Position           string    `xorm:"comment('设施位置') VARCHAR(50)"`
 	LinkStatus         string    `xorm:"comment('防护及连接状况') VARCHAR(50)"`

src/dashoo.cn/backend/api/business/limsreportldbh/Limsreportldbh.go

@@ -19,6 +19,8 @@ type LimsReportLeakProtect struct {
 	TestDepart         string    `xorm:"comment('受检单位') VARCHAR(255)"`
 	Position           string    `xorm:"comment('安装地点') VARCHAR(255)"`
 	OrderNo            int       `xorm:"comment('序号') INT(11)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10)"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(50)"`
 	DetectBasis        string    `xorm:"comment('依据标准') VARCHAR(255)"`
 	CustNo             string    `xorm:"comment('出厂编号') VARCHAR(255)"`
 	ProductNo          string    `xorm:"comment('检测编号') VARCHAR(255)"`

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

@@ -18,6 +18,8 @@ type LimsReportLightProtect struct {
 	TestDepart         string    `xorm:"comment('受检单位') VARCHAR(255)"`
 	District           string    `xorm:"comment('分布区域') VARCHAR(255)"`
 	OrderNo            int       `xorm:"comment('序号') int(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10)"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(50)"`
 	DetectBasis        string    `xorm:"comment('依据标准') VARCHAR(255)"`
 	Position           string    `xorm:"comment('装置部位名称') VARCHAR(50)"`
 	ReceiveLightStatus string    `xorm:"comment('接闪器及情况') VARCHAR(50)"`