Explorar el Código

明细加设备id宇信

huahaiyan hace 6 años
padre
commit
b22fb44fa2

+ 2 - 0
src/dashoo.cn/backend/api/business/Limsreportyyaqf/Limsreportyyaqf.go

@@ -19,6 +19,8 @@ type LimsReportYeyaqf struct {
 	CustNo             string    `xorm:"comment('编号') VARCHAR(255)"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
 	SpecId             int       `xorm:"comment('规格型号Id') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	Temperature        string    `xorm:"comment('环境温度') VARCHAR(50)"`

+ 2 - 0
src/dashoo.cn/backend/api/business/Limsreportzuhq/Limsreportzuhq.go

@@ -18,6 +18,8 @@ type LimsReportZuhq struct {
 	CustNo             string    `xorm:"comment('编号') VARCHAR(255)"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
 	SpecId             int       `xorm:"comment('规格型号Id') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	CheckDate          time.Time `xorm:"comment('检测时间') DATETIME"`

+ 12 - 0
src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -315,6 +315,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			hzf.OrderNo = item.OrderNo
 			hzf.CustNo = item.CustNo
 			hzf.Spec = item.Spec
+			hzf.DeviceName = item.DeviceName
+			hzf.DeviceId = item.DeviceId
 			hzf.Position = item.Position
 			hzf.PositionId = item.PositionID
 			hzf.PosPress1 = "0"
@@ -397,6 +399,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			yeyaqf.OrderNo = item.OrderNo
 			yeyaqf.CustNo = item.CustNo
 			yeyaqf.Spec = item.Spec
+			yeyaqf.DeviceName = item.DeviceName
+			yeyaqf.DeviceId = item.DeviceId
 			yeyaqf.Position = item.Position
 			yeyaqf.PositionId = item.PositionID
 			yeyaqf.PosPress1 = "0"
@@ -434,6 +438,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			kqpm.OrderNo = item.OrderNo
 			kqpm.CustNo = item.CustNo
 			kqpm.Spec = item.Spec
+			kqpm.DeviceName = item.DeviceName
+			kqpm.DeviceId = item.DeviceId
 			kqpm.Position = item.Position
 			kqpm.PositionId = item.PositionID
 			kqpm.CreateOn = time.Now()
@@ -450,6 +456,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			yl.DataEntryId = dataentryid
 			yl.CustNo = item.CustNo
 			yl.Spec = item.Spec
+			yl.DeviceName = item.DeviceName
+			yl.DeviceId = item.DeviceId
 			yl.Position = item.Position
 			yl.PositionId = item.PositionID
 			yl.CreateOn = time.Now()
@@ -480,6 +488,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			zuhq.OrderNo = item.OrderNo
 			zuhq.CustNo = item.CustNo
 			zuhq.Spec = item.Spec
+			zuhq.DeviceName = item.DeviceName
+			zuhq.DeviceId = item.DeviceId
 			zuhq.Position = item.Position
 			zuhq.PositionId = item.PositionID
 			zuhq.CreateOn = time.Now()
@@ -495,6 +505,8 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			wyl.OrderNo = strconv.Itoa(item.OrderNo)
 			wyl.CustNo = item.CustNo
 			wyl.Spec = item.Spec
+			wyl.DeviceName = item.DeviceName
+			wyl.DeviceId = item.DeviceId
 			wyl.Position = item.Position
 			wyl.PositionId = item.PositionID
 			wyl.CreateOn = time.Now()

+ 2 - 0
src/dashoo.cn/backend/api/business/limsreportbeampumpingunits/limsreportbeampumpingunits.go

@@ -18,6 +18,8 @@ type LimsReportBeamPumpingUnits struct {
 	CustNo             string    `xorm:"comment('出厂编号') VARCHAR(255)"`
 	ProductDate        time.Time `xorm:"DATETIME"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	CheckDate          time.Time `xorm:"DATETIME"`

+ 2 - 0
src/dashoo.cn/backend/api/business/limsreporthuxf/limsreporthuxf.go

@@ -19,6 +19,8 @@ type LimsReportHuxf struct {
 	CustNo             string    `xorm:"comment('编号') VARCHAR(255)"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
 	SpecId             int       `xorm:"comment('规格型号Id') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	CheckDate          time.Time `xorm:"DATETIME"`

+ 2 - 0
src/dashoo.cn/backend/api/business/limsreportkqpm/Limsreportkqpm.go

@@ -19,6 +19,8 @@ type LimsReportAirFoamGenerator struct {
 	CustNo             string    `xorm:"comment('编号') VARCHAR(255)"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
 	SpecId             int       `xorm:"comment('规格型号ID') INT(10)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	CheckDate          time.Time `xorm:"DATETIME"`

+ 2 - 0
src/dashoo.cn/backend/api/business/limsreportnobeampumpingunits/limsreportnobeampumpingunits.go

@@ -18,6 +18,8 @@ type LimsReportNoBeamPumpingUnit struct {
 	CustNo             string    `xorm:"comment('出厂编号') VARCHAR(255)"`
 	ProductDate        time.Time `xorm:"DATETIME"`
 	Spec               string    `xorm:"comment('规格型号') VARCHAR(255)"`
+	DeviceId           int       `xorm:"comment('设备ID') INT(10) 'DeviceId'"`
+	DeviceName         string    `xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	Manufacturer       string    `xorm:"comment('制造厂家') VARCHAR(255)"`
 	Status             string    `xorm:"comment('产品状态') VARCHAR(255)"`
 	CheckDate          time.Time `xorm:"DATETIME"`