东邨盒/管类型

Gene_point_Service/.idea/workspace.xml

@@ -2,9 +2,8 @@
 <project version="4">
   <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/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" />
@@ -17,11 +16,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <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="954">
-              <caret line="134" column="9" selection-start-line="134" selection-start-column="9" selection-end-line="134" selection-end-column="9" />
+            <state relative-caret-position="427">
+              <caret line="42" column="17" lean-forward="true" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
               <folding>
                 <element signature="e#18#192#0" expanded="true" />
               </folding>
@@ -32,17 +31,20 @@
       <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="1283">
-              <caret line="97" column="19" lean-forward="true" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
+            <state relative-caret-position="754">
+              <caret line="97" column="19" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <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="478">
-              <caret line="467" column="1" lean-forward="true" selection-start-line="467" selection-start-column="1" selection-end-line="467" selection-end-column="1" />
+            <state relative-caret-position="289">
+              <caret line="352" column="38" selection-start-line="352" selection-start-column="32" selection-end-line="352" selection-end-column="38" />
+              <folding>
+                <element signature="e#25#144#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -50,8 +52,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="425">
-              <caret line="131" column="22" lean-forward="true" selection-start-line="131" selection-start-column="22" selection-end-line="131" selection-end-column="22" />
+            <state relative-caret-position="404">
+              <caret line="142" column="32" selection-start-line="142" selection-start-column="32" selection-end-line="142" selection-end-column="32" />
               <folding>
                 <element signature="e#14#173#0" expanded="true" />
               </folding>
@@ -96,9 +98,9 @@
         <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/business/converseService/converseService.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/converseService.go" />
       </list>
     </option>
   </component>
@@ -113,7 +115,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -164,6 +165,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -247,7 +249,7 @@
     <frame x="1912" y="-8" width="2576" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.16070008" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.1618934" />
       <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" />
@@ -583,36 +585,39 @@
         </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/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1283">
-          <caret line="97" column="19" lean-forward="true" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
+        <state relative-caret-position="404">
+          <caret line="142" column="32" selection-start-line="142" selection-start-column="32" selection-end-line="142" selection-end-column="32" />
+          <folding>
+            <element signature="e#14#173#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.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="478">
-          <caret line="467" column="1" lean-forward="true" selection-start-line="467" selection-start-column="1" selection-end-line="467" selection-end-column="1" />
+        <state relative-caret-position="754">
+          <caret line="97" column="19" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.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="425">
-          <caret line="131" column="22" lean-forward="true" selection-start-line="131" selection-start-column="22" selection-end-line="131" selection-end-column="22" />
+        <state relative-caret-position="427">
+          <caret line="42" column="17" lean-forward="true" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
           <folding>
-            <element signature="e#14#173#0" expanded="true" />
+            <element signature="e#18#192#0" expanded="true" />
           </folding>
         </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/converseService.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="954">
-          <caret line="134" column="9" selection-start-line="134" selection-start-column="9" selection-end-line="134" selection-end-column="9" />
+        <state relative-caret-position="289">
+          <caret line="352" column="38" selection-start-line="352" selection-start-column="32" selection-end-line="352" selection-end-column="38" />
           <folding>
-            <element signature="e#18#192#0" expanded="true" />
+            <element signature="e#25#144#0" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -135,21 +135,21 @@ func (this *ConverseService) GetNewTaskBasic () []Sample_Storage_Task{
 	return tasks
 }
 
-//冻存管位置格式转换
-func TransPositionToNo(boxType int, position string) int{
-	co := strings.Split(position,";")
-	x, _ := strconv.Atoi(co[0])
-	y, _ := strconv.Atoi(co[1])
-	var no int
-	switch boxType {
-	case 101,102,103:
-		no = (y-1)*14+x
-		break
-	case 0 :
-		no = (y-1)*10+x
-	}
-	return no
-}
+////冻存管位置格式转换
+//func TransPositionToNo(boxType int, position string) int{
+//	co := strings.Split(position,";")
+//	x, _ := strconv.Atoi(co[0])
+//	y, _ := strconv.Atoi(co[1])
+//	var no int
+//	switch boxType {
+//	case 101,102,103:
+//		no = (y-1)*14+x
+//		break
+//	case 0 :
+//		no = (y-1)*10+x
+//	}
+//	return no
+//}
 
 //根据任务类型获取requestName
 func (this *ConverseService)GenerateRequestEntity(taskType int, task_id string) *RequestEntity{
@@ -302,10 +302,10 @@ 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.Rack = 101			//测试临时使用
+		//one.Tube = 201			//测试临时使用
+		one.Rack = detail.BoxType    //样本库系统,没有添加该字段信息逻辑,临时注释
+		one.Tube = detail.TubeType   //样本库系统,没有添加该字段信息逻辑,临时注释
 		one.Source.Cu = CU
 		one.Source.Ee = EE
 		one.Source.Pos = POS

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

@@ -128,7 +128,7 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 				err = this.StatusModify(REJECT,taskId)
 				break
 			case "abnormal_end":
-				log.Println(">>>>>>>>>>修改驳回状态>>>>>>>>>>")
+				log.Println("----------修改失败状态----------")
 				//保存异常信息
 				this.SaveExcepMsg(res,taskId)
 				err = this.StatusModify(REJECT,taskId)