检测计划加设备ID

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

@@ -15,6 +15,7 @@ type LimsEntrustEquipment struct {
 	PositionID       int       `json:"PositionID" xorm:"comment('安装位置ID') INT(11) 'PositionID'"`
 	Position         string    `json:"Position" xorm:"comment('安装位置') VARCHAR(255) 'Position'"`
 	CustNo           string    `json:"CustNo" xorm:"comment('编号') VARCHAR(255) 'CustNo'"`
+	DeviceId         int       `json:"DeviceId" xorm:"comment('设备ID') INT(10) 'DeviceId'"`
 	DeviceName       string    `json:"DeviceName" xorm:"comment('设备名称') VARCHAR(255) 'DeviceName'"`
 	TemplateTypeId   int       `json:"TemplateTypeId" xorm:"comment('模板分类ID') INT(10) 'TemplateTypeId'"`
 	TemplateTypeName string    `json:"TemplateTypeName" xorm:"comment('模板分类名称') VARCHAR(255) 'TemplateTypeName'"`

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

@@ -274,8 +274,8 @@ func (this *LimsEnturstController) AddEntrust() {
 	// 保存设备明细
 	queryCheckDate := this.GetString("querycheckdate")
 	insertEquipmentSQL := "INSERT INTO " + this.User.AccCode + LimsEntrustEquipmentName
-	insertEquipmentSQL += "(Entrustmainid, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, CreateOn, CreateUserId, CreateBy)"
-	insertEquipmentSQL += " SELECT '" + strconv.Itoa(model.Id) + "' as EntrustMainId, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, now() as CreateOn, '" + this.User.Id + "' as CreateUserId, '" + this.User.Realname + "' as CreateBy FROM "
+	insertEquipmentSQL += "(Entrustmainid, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, DeviceId, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, CreateOn, CreateUserId, CreateBy)"
+	insertEquipmentSQL += " SELECT '" + strconv.Itoa(model.Id) + "' as EntrustMainId, Departmentid, Departmentname, Orderno, Positioncheckid, Positioncheck, Positionid, Position, Custno, Id, Devicename, Templatetypeid, Templatetypename, Spec, Specid, Manufacturer, Status, Remark, now() as CreateOn, '" + this.User.Id + "' as CreateUserId, '" + this.User.Realname + "' as CreateBy FROM "
 	insertEquipmentSQL += this.User.AccCode + LimsCheckEquipmentListName
 	insertEquipmentSQL += " WHERE PositionCheckId=" + strconv.Itoa(model.AddressId)
 	insertEquipmentSQL += " and TemplateTypeId=" + strconv.Itoa(model.ProjectTypeId)