3
2
lining 6 vuotta sitten
vanhempi
commit
4bc129b299

+ 20 - 12
src/dashoo.cn/backend/api/business/limsdataentry/limsdataentry.go

@@ -171,20 +171,28 @@ type LimsDateEntry struct {
 	TestDepart         string    `xorm:"VARCHAR(100)"` //受检单位
 	PositionCheckId    int       `xorm:"INT(11)"`      //检测地点
 	PositionCheck      string    `xorm:"VARCHAR(100)"`
-	Product            string    `xorm:"VARCHAR(50)"` // 产品名称
-	Spec               string    `xorm:"VARCHAR(50)"` // 产品名称
+	Product            string    `xorm:"VARCHAR(50)"`  // 产品名称
+	Spec               string    `xorm:"VARCHAR(50)"`  // 产品名称
 	SamplingBase       int       `xorm:"INT(10)"`      // 抽样基数
 	SampleQty          int       `xorm:"INT(10)"`      // 样品数量
-	Appearance      string `xorm:"VARCHAR(100)"`  //外观检验
-	MRemark         string  `xorm:"VARCHAR(255)"` // 主信息备注
-	InspectionDate  time.Time `xorm:"DATETIME"` //  检验日期
-	Instrument1  string    `xorm:"VARCHAR(255)"` //设备1
-	Instrument2  string    `xorm:"VARCHAR(255)"`
-	Instrument3  string    `xorm:"VARCHAR(255)"`
-	Temperature  string    `xorm:"VARCHAR(50)"`
-	DetectBasis  string    `xorm:"VARCHAR(500)"`
-	StandardDesc string    `xorm:"VARCHAR(500)"`
-	CheckDate    time.Time `xorm:"DATETIME"`
+	Appearance         string    `xorm:"VARCHAR(100)"` //外观检验
+	MRemark            string    `xorm:"VARCHAR(255)"` // 主信息备注
+	InspectionDate     time.Time `xorm:"DATETIME"`     //  检验日期
+	Instrument1        string    `xorm:"VARCHAR(255)"` //设备1
+	Instrument2        string    `xorm:"VARCHAR(255)"`
+	Instrument3        string    `xorm:"VARCHAR(255)"`
+	Temperature        string    `xorm:"VARCHAR(50)"`
+	DetectBasis        string    `xorm:"VARCHAR(500)"`
+	StandardDesc       string    `xorm:"VARCHAR(500)"`
+	CheckDate          time.Time `xorm:"DATETIME"`
+	TBModel            string    `xorm:"VARCHAR(20)"` // 试块型号
+	ScanSnty           string    `xorm:"VARCHAR(20)"` // 扫查灵敏度
+	ScanRegu           string    `xorm:"VARCHAR(20)"` // 扫查调节
+	TestLoc            string    `xorm:"VARCHAR(20)"` // 检测部位
+	Couplant           string    `xorm:"VARCHAR(20)"` // 耦合剂
+	Comp               float64    `xorm:"DECIMAL(10,2)"` // 补偿
+	UPRange            string    `xorm:"VARCHAR(20)"` // 声程范围
+	SVRange            float64    `xorm:"DECIMAL(10,2)"` //声速范围
 
 	CheckBy        string    `xorm:"VARCHAR(50)"`
 	CreatedTime    time.Time `xorm:"DATETIME created"` //创建时间

+ 2 - 2
src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -36,8 +36,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://localhost:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
-	s.OriginUrl = "http://localhost:8081/api"
-	//s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	//s.OriginUrl = "http://localhost: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"
 	s.Username = "leader"

+ 8 - 0
src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -4300,6 +4300,14 @@ func (this *LimsDataEntryController) UpdateEntity() {
 		"Appearance",
 		"MRemark",
 		"InspectionDate",
+		"TBModel",
+		"ScanSnty",
+		"ScanRegu",
+		"TestLoc",
+		"Couplant",
+		"Comp",
+		"UPRange",
+		"SVRange",
 	}
 	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, id, &model, cols)
 	if err == nil {