添加源盒字段

src/dashoo.cn/genepoint_srv/business/converseService/converse.go

@@ -41,6 +41,7 @@ type RequestData struct {
 	Rack_id        string        `json:"rack_id,omitempty"`
 	Tube_id        string        `json:"tube_id,omitempty"`
 	Task_id        string        `json:"task_id,omitempty"`
+	Operation_user        string        `json:"operation_user,omitempty"`  //
 	Task_data      interface{}   `json:"task_data,omitempty"`
 	List           []interface{} `json:"list,omitempty"`
 	Operation_mode string        `json:"operation_mode,omitempty"`
@@ -221,6 +222,7 @@ type Sample_Storage_Task struct {
 	OperaMode   string
 	Exception   string `xorm:"VARCHAR(512)"`
 	Remark      string
+	SourceBox   string   // 源盒编码
 }
 
 type Id struct {

src/dashoo.cn/genepoint_srv/business/converseService/converseService.go

@@ -125,6 +125,19 @@ func (this *ConverseService) ScanNewTaskDetail() []Sample_Storage_Task {
 	return tasks
 }
 
+
+// 获取申请单创建人
+func (this *ConverseService)GetOperUser(EntryNo string)(user string ){
+
+	// 获取当前任务的操作人
+	sql := " select  a.UserName from   base_user a left join   bank_apply_main b  on a.id = b.CreateUserId  where b.EntryNo ='"+EntryNo +"' "
+	this.DBE.SQL(sql).Get(&user)
+	return user
+}
+
+
+
+
 //新任务数量
 func (this *ConverseService) GetNewTaskBasic() []Sample_Storage_Task {
 	//var count64 int64
@@ -166,7 +179,7 @@ func (this *ConverseService) GetNewTaskBasic() []Sample_Storage_Task {
 //}
 
 // 生成请求实体，根据任务类型获取requestName
-func (this *ConverseService) GenerateRequestEntity(taskType int, task_id string) *RequestEntity {
+func (this *ConverseService) GenerateRequestEntity(taskType int, task_id ,user string) *RequestEntity {
 	var requestName string
 	switch taskType {
 	case 1:
@@ -195,6 +208,8 @@ func (this *ConverseService) GenerateRequestEntity(taskType int, task_id string)
 	if requestName != "stock_rack" && requestName != "stock_rack_tube" {
 		data.Task_id = task_id
 		data.Type = "begin"
+		data.Operation_user = user
+		data.Operation_mode = "manua"
 	}
 	entity := this.GetRequestEntity(requestName, utc, data)
 	return entity
@@ -321,11 +336,12 @@ func handleTubeStore(entity *RequestEntity, detail *Sample_Storage_Task) {
 	// 盒子不存在新加盒子及管信息
 	if !exist {
 		var one Single
-		//one.Rack = 101			//测试临时使用
-		//one.Tube = 201			//测试临时使用
-		one.Rack = detail.BoxType  //样本库系统,没有添加该字段信息逻辑,临时注释
-		one.Tube = detail.TubeType //样本库系统,没有添加该字段信息逻辑,临时注释
-		//one.Source.Cu = CU		 //测试临时使用
+		//one.Rack = 101			// 测试临时使用
+		//one.Tube = 201			// 测试临时使用
+		one.Rack = detail.BoxType   // 样本库系统,没有添加该字段信息逻辑,临时注释
+		one.Tube = detail.TubeType  // 样本库系统,没有添加该字段信息逻辑,临时注释
+		one.Rack_id = detail.SourceBox		 	// 此处需要添加源盒编码  SourceBox
+		//one.Source.Cu = CU		// 测试临时使用
 		one.Source.Cu = detail.Cu
 		one.Source.Ee = EE
 		one.Source.Pos = POS
@@ -605,7 +621,7 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 			var tubes = value.Tubes
 			fmt.Println("样本位置信息：", tubes)
 			//新增方法 更新位置信息
-			defer this.UpdatePosition(Rack_id, tubes, entity, applyMain.Id)
+			this.UpdatePosition(Rack_id, tubes, entity, applyMain.Id)
 		}