feature(盛京)：销毁兼容基点自动化

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

@@ -20,6 +20,7 @@ const SAMPLE_STATUS_OUT = 5
 const SAMPLE_STATUS_IN = 2
 const TASK_TUBE_STORING = 1
 const TASK_TUBE_RETREIVING = 2
+const TASK_TUBE_DES = 3
 
 // 请求报文实体
 type RequestEntity struct {

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

@@ -2,17 +2,18 @@ package converseService
 
 import (
 	"crypto/md5"
-	"dashoo.cn/genepoint_srv/business/arrangeService"
-	"dashoo.cn/genepoint_srv/business/common"
 	"fmt"
-	"github.com/gogf/gf/os/gtime"
-	"github.com/gogf/gf/util/gconv"
-	"github.com/unknwon/com"
 	"log"
 	"strconv"
 	"strings"
 	"time"
 
+	"dashoo.cn/genepoint_srv/business/arrangeService"
+	"dashoo.cn/genepoint_srv/business/common"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
+	"github.com/unknwon/com"
+
 	"github.com/gogf/gf/os/glog"
 	"xorm.io/xorm"
 
@@ -710,7 +711,7 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 		//lite设备 部分管子出库
 		taskType = "tube_retrieving"
 		operaIds, abnormalIds = this.getOperaSampleIdsStr(applyMain.ApplyType, applyMain.Id, resp, entity)
-	} else if applyMain.ApplyType == TASK_TUBE_RETREIVING && strings.Contains(resp, "_retrieving") /*resp == "rack_retrieving"*/ /*&& entity.Data.Is_end*/ {
+	} else if (applyMain.ApplyType == TASK_TUBE_RETREIVING || applyMain.ApplyType == TASK_TUBE_DES) && strings.Contains(resp, "_retrieving") /*resp == "rack_retrieving"*/ /*&& entity.Data.Is_end*/ {
 		fmt.Println("开始出库3")
 		//lite设备 整盒出库
 		taskType = "tube_retrieving"
@@ -729,7 +730,7 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 	}
 
 	// 根据管操作 或 盒操作 判断是否执行以下更新
-	if (applyMain.ApplyType == TASK_TUBE_STORING && strings.Contains(resp, "_storing")) || (applyMain.ApplyType == TASK_TUBE_RETREIVING && strings.Contains(resp, "_retrieving")) {
+	if (applyMain.ApplyType == TASK_TUBE_STORING && strings.Contains(resp, "_storing")) || (applyMain.ApplyType == TASK_TUBE_RETREIVING || applyMain.ApplyType == TASK_TUBE_DES && strings.Contains(resp, "_retrieving")) {
 		this.handleSampleSuccess(operaIds, taskType, applyMain.Id)
 		if entity.Data.Type == "abnormal_end" {
 			this.handleSampleFailed(abnormalIds, taskType, applyMain.Id)
@@ -1054,7 +1055,7 @@ func (this *ConverseService) getOperaSampleIdsStr(applyType, parentId int, resp
 		}
 	}
 
-	if applyType == TASK_TUBE_RETREIVING {
+	if applyType == TASK_TUBE_RETREIVING || applyType == TASK_TUBE_DES {
 		for _, sampleId := range sampleIds {
 			//操作成功样本Id
 			for _, tubeId := range actualTubeIds {

src/dashoo.cn/genepoint_srv/go.mod

@@ -13,4 +13,4 @@ require (
 	xorm.io/xorm v1.1.2
 )
 
-replace dashoo.cn/base_common => ../../../../base_dashoo_common/src/dashoo.cn
+replace dashoo.cn/base_common => ../../../../../dependency/base_dashoo_common-go_module/src/dashoo.cn