|
|
@@ -245,7 +245,7 @@ func handleRackStore(entity *RequestEntity, detail *Sample_Storage_Task) {
|
|
|
if entity.Data.Task_data != nil {
|
|
|
ones = entity.Data.Task_data.([]Single)
|
|
|
for idx, value := range ones {
|
|
|
- if value.Rack_id == detail.BoxBarcode {
|
|
|
+ if value.Target.Cu == detail.Cu && value.Target.Unit == detail.Unit && value.Target.Pos == detail.Pos && value.Target.Ltu == detail.Ltu && value.Target.Group == detail.Group && value.Rack_id == detail.BoxBarcode {
|
|
|
var tube Tube
|
|
|
tube.Id = detail.BarCode
|
|
|
ones[idx].Tubes = append(ones[idx].Tubes, tube)
|
|
|
@@ -314,8 +314,8 @@ func handleTubeStore(entity *RequestEntity, detail *Sample_Storage_Task) {
|
|
|
ones = entity.Data.Task_data.([]Single)
|
|
|
for idx, value := range ones {
|
|
|
// 若目标盒一致,则追加样本
|
|
|
- isSampleTarget := value.Target.Cu == detail.Cu && value.Target.Ltu == detail.Ltu && value.Target.Group == detail.Group && value.Target.Unit == detail.Unit && value.Target.Pos == detail.Pos &&value.Target.Rack_id == detail.BoxBarcode
|
|
|
- if isSampleTarget{
|
|
|
+ isSampleTarget := value.Target.Cu == detail.Cu && value.Target.Ltu == detail.Ltu && value.Target.Group == detail.Group && value.Target.Unit == detail.Unit && value.Target.Pos == detail.Pos && value.Target.Rack_id == detail.BoxBarcode
|
|
|
+ if isSampleTarget {
|
|
|
var tube Tube
|
|
|
if detail.OperaMode != "auto" {
|
|
|
//tube.T_no = TransPositionToNo(detail.BoxType,detail.Position)
|