Bladeren bron

fix(基点功能) 结构体中参数 属性修改使用string

xuchl 3 jaren geleden
bovenliggende
commit
dcba93c8a3

+ 3 - 3
src/dashoo.cn/genepoint_srv/business/converseService/converse.go

@@ -290,11 +290,11 @@ type Equipment struct {
 }
 // 盒子规格信息
 type Box struct {
-	EquipmentId  int // 容器id
-	ShelfId  int  // 冻存架id
+	EquipmentId  string // 容器id
+	ShelfId  string  // 冻存架id
 	Id  int    // 盒子id
-	RowNum int          //盒子行数
 	ColumnNum int		// 盒子列数
+	RowNum int          //盒子行数
 	XStation   int   // 位置 X代表第几列
 	YStation   int    // 位置 Y代表第几行
 }

+ 12 - 8
src/dashoo.cn/genepoint_srv/business/converseService/converseService.go

@@ -4,7 +4,6 @@ import (
 	"crypto/md5"
 	"dashoo.cn/genepoint_srv/business/arrangeService"
 	"fmt"
-	"gitee.com/johng/gf/util/gconv"
 	"github.com/Unknwon/com"
 	"github.com/gogf/gf/os/glog"
 	"log"
@@ -671,6 +670,13 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 	fmt.Println("resp:", resp)
 
 	var operaIds, abnormalIds, taskType string
+
+	// 此处判断,如果是冻存盒整盒入库,需要更新盒子位置信息  盒  冻存盒当前的 所在的冻存架的id
+	if resp == "rack_storing" {
+		fmt.Println("冻存盒入库")
+		this.UpdateBoxInfo(entity,applyMain.Id)
+	}
+
 	if applyMain.ApplyType == TASK_TUBE_STORING && strings.Contains(resp, "_storing") {
 
 		fmt.Println("开始入库1", entity)
@@ -706,10 +712,7 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 	}
 
 	// 此处判断,如果是冻存盒整盒入库,需要更新盒子位置信息  盒  冻存盒当前的 所在的冻存架的id
-	if resp == "rack_storing" {
-		fmt.Println("冻存盒入库")
-		this.UpdateBoxInfo(entity,applyMain.Id)
-	} else if resp == "rack_retrieving" {
+	  if resp == "rack_retrieving" {
 		fmt.Println("冻存盒出库")
 		//rack_retrieving
 		// 冻存盒出库任务完成以后,需要清空冻存盒中的冻存架信息,同时清空
@@ -911,14 +914,15 @@ func (this *ConverseService) UpdatePosition(rack_id string, tubes []Tube, entity
 	sql := "select Id,RowNum,ColumnNum,EquipmentId,ShelfId,XStation,YStation   from bank_box where Barcode ='" + rack_id + "'"
 	var box Box
 	this.DBE.SQL(sql).Get(&box)
-
+	glog.Info("盒信息: ",  box)
+	glog.Info("容器Id: ", box.EquipmentId, ";字符串:", utils.ToStr( box.EquipmentId))
 	// 根据盒子信息获取容器和冻存架信息, 用于更新样本孔位信息
 	//  获取容器信息
-	equipmentsql := " select Id,Code,Name from bank_equipment where id = '"+ gconv.String( box.EquipmentId)+"'   "
+	equipmentsql := " select Id,Code,Name from bank_equipment where id = '"+  box.EquipmentId+"'   "
 	var equipmentInfo EquipmentInfo
 	this.DBE.SQL(equipmentsql).Get(&equipmentInfo)
 	//  获取架子信息
-	shelfsql := " select Id,XStation,YStation from bank_shelf where id = '"+ gconv.String( box.ShelfId)+"'   "
+	shelfsql := " select Id,XStation,YStation from bank_shelf where id = '"+box.ShelfId+"'   "
 	var shelf Shelf
 	this.DBE.SQL(shelfsql).Get(&shelf)