盒子barcode添加

Gene_point_Service/.idea/workspace.xml

@@ -3,9 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="83c812bd-fdcd-4344-b866-5ecaac02b490" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/api" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/api" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,8 +22,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+            <state relative-caret-position="308">
+              <caret line="42" column="37" selection-start-line="42" selection-start-column="37" selection-end-line="42" selection-end-column="37" />
               <folding>
                 <element signature="e#14#173#0" expanded="true" />
               </folding>
@@ -33,8 +34,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="38" column="19" lean-forward="true" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
+            <state relative-caret-position="667">
+              <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -42,8 +43,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2875">
-              <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
+            <state relative-caret-position="195">
+              <caret line="108" column="19" lean-forward="true" selection-start-line="108" selection-start-column="19" selection-end-line="108" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -51,8 +52,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="473">
-              <caret line="197" column="12" lean-forward="true" selection-start-line="197" selection-start-column="12" selection-end-line="197" selection-end-column="12" />
+            <state relative-caret-position="10">
+              <caret line="401" column="74" lean-forward="true" selection-start-line="401" selection-start-column="74" selection-end-line="401" selection-end-column="74" />
             </state>
           </provider>
         </entry>
@@ -63,6 +64,7 @@
     <findStrings>
       <find>interrupt</find>
       <find>ModifyTaskStatusCode</find>
+      <find>TransPositionToNo</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -88,16 +90,16 @@
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse_test.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/base.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/routers/router.go" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="1913" />
-    <option name="width" value="2572" />
+    <option name="width" value="1445" />
     <option name="height" value="1047" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -106,6 +108,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -156,7 +159,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -237,14 +239,14 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="2576" height="1056" extended-state="7" />
+    <frame x="1913" y="0" width="1445" height="1047" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.15274464" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.28199565" />
       <window_info id="Structure" order="1" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info id="Favorites" order="2" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49960256" weight="0.3179669" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49960256" weight="0.0" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.61915886" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" weight="0.32485548" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -286,7 +288,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/business/converseService/converseService_test.go" />
     <entry file="file://$PROJECT_DIR$/business/converseService/converseService.go" />
     <entry file="file://$PROJECT_DIR$/controllers/base.go" />
     <entry file="file://$PROJECT_DIR$/controllers/converse/converse.go" />
@@ -537,34 +538,41 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://E:/DASHOO/base_go/src/github.com/gorilla/websocket/conn.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="1023" column="15" selection-start-line="1023" selection-start-column="15" selection-end-line="1023" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+        <state relative-caret-position="308">
+          <caret line="42" column="37" selection-start-line="42" selection-start-column="37" selection-end-line="42" selection-end-column="37" />
           <folding>
             <element signature="e#14#173#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2875">
-          <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
+        <state relative-caret-position="667">
+          <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="38" column="19" lean-forward="true" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
+        <state relative-caret-position="195">
+          <caret line="108" column="19" lean-forward="true" selection-start-line="108" selection-start-column="19" selection-end-line="108" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="473">
-          <caret line="197" column="12" lean-forward="true" selection-start-line="197" selection-start-column="12" selection-end-line="197" selection-end-column="12" />
+        <state relative-caret-position="10">
+          <caret line="401" column="74" lean-forward="true" selection-start-line="401" selection-start-column="74" selection-end-line="401" selection-end-column="74" />
         </state>
       </provider>
     </entry>

Gene_point_Service/src/dashoo.cn/api/business/converseService/converse.go

@@ -109,6 +109,7 @@ type Sample_Storage_Task struct {
 	S_X			int
 	S_Y			int
 	BoxId 		string
+	BoxBarcode 	string
 	B_Row		int
 	B_Col		int
 	B_X			int

Gene_point_Service/src/dashoo.cn/api/business/converseService/converseService.go

@@ -193,7 +193,7 @@ func TransPositionToNo(boxType int, position string) int{
 	var no int
 	switch boxType {
 	case 101,102,103:
-		no = (y-1)*9+x
+		no = (y-1)*14+x
 		break
 	case 0 :
 		no = (y-1)*10+x
@@ -269,7 +269,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.BoxId {
+			if value.Rack_id == detail.BoxBarcode{
 				var tube Tube
 				tube.Id = detail.BarCode
 				ones[idx].Tubes = append(ones[idx].Tubes,tube)
@@ -282,7 +282,7 @@ func handleRackStore (entity *RequestEntity, detail *Sample_Storage_Task) {
 		var one Single
 		one.Rack = detail.BoxType
 		one.Tube = detail.TubeType
-		one.Rack_id = detail.BoxId
+		one.Rack_id = detail.BoxBarcode
 		one.Source.Cu = CU
 		one.Source.Ee = EE
 		one.Source.Pos = POS
@@ -314,10 +314,10 @@ func handleRackRetrieve(entity *RequestEntity, detail *Sample_Storage_Task){
 	//}else{
 		ones = entity.Data.Task_data.([]Single)
 	}
-	one.Rack_id = detail.BoxId
+	one.Rack_id = detail.BoxBarcode
 	one.Target.Cu = CU
 	one.Target.Ee = EE
-	one.Target.Pos =POS
+	one.Target.Pos = POS
 	ones = append(ones, one)
 	entity.Data.Task_data = ones
 }
@@ -334,11 +334,12 @@ func handleTubeStore (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.Target.Rack_id == detail.BoxId {
+			if value.Target.Rack_id == detail.BoxBarcode {
 				var tube Tube
 				if detail.OperaMode != "auto" {
-					tube.T_no = TransPositionToNo(detail.BoxType,detail.Position)
-					//实际采用,暂时注释掉 tube.T_no = detail.No
+					//tube.T_no = TransPositionToNo(detail.BoxType,detail.Position)
+					//实际采用,暂时注释掉
+					tube.T_no = detail.No
 				}
 				tube.Id = detail.BarCode
 				ones[idx].Tubes = append(ones[idx].Tubes,tube)
@@ -365,7 +366,7 @@ func handleTubeStore (entity *RequestEntity, detail *Sample_Storage_Task){
 			one.Target.Group = detail.Group
 			one.Target.Unit = detail.Unit
 			one.Target.Pos = detail.Pos
-			one.Target.Rack_id = detail.BoxId
+			one.Target.Rack_id = detail.BoxBarcode
 			//tube.T_no = TransPositionToNo(detail.BoxType,detail.Position)
 			tube.T_no = detail.No //实际采用,暂时注释掉
 		}
@@ -405,12 +406,12 @@ func handleTaskChange(entity *RequestEntity, detail *Sample_Storage_Task){
 //查询冻存盒库存信息
 func handleQueryRack(entity *RequestEntity, detail *Sample_Storage_Task){
 	entity.Data.Cu = detail.EquipmentId
-	entity.Data.Rack_id = detail.BoxId
+	entity.Data.Rack_id = detail.BoxBarcode
 }
 
 //查询冻存管库存信息
 func handleQueryTube(entity *RequestEntity, detail *Sample_Storage_Task){
-	entity.Data.Rack_id = detail.BoxId
+	entity.Data.Rack_id = detail.BoxBarcode
 	entity.Data.Tube_id = detail.BarCode
 }
 

Gene_point_Service/src/dashoo.cn/api/controllers/converse/converse.go

@@ -99,12 +99,12 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 	taskType := res.Data.Type
 	var err error
 	//如果正常响应且任务执行成功则修改任务状态为成功
-	if result == 200 && isEnd && res.Data.Abnormal_data == nil {
+	if result == 200 && res.Data.Abnormal_data == nil {
 		if isEnd && res.Data.Abnormal_data == nil{
 			log.Println("---------修改成功状态-----------")
 			//todo or link to biobank
 			err = this.StatusModify(SUCCESS,taskId)
-		}else if taskType == "task_ activate" {
+		}else if taskType == "task_activate" {
 			log.Println(">>>>>>>>>>修改激活状态>>>>>>>>>>")
 			err = this.StatusModify(ACTIVE,taskId)
 		}else if taskType == "accept" {