“基点LITE2液氮罐

src/dashoo.cn/backend/api/controllers/equipment/equipment.go

@@ -860,6 +860,96 @@ func (this *EquipmentController) AddEquipment() {
 		var lastnum_shelf lastordernum.LastOrderNum
 		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
 		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
+	} else if model.DItem == 23 {
+		shelf_x_int := 1
+		shelf_y_int := 13
+		box_x_int := 12
+		box_y_int := 8
+		svcshelf := shelfset.GetshelfsetService(utils.DBE)
+		lastdata := svcshelf.GetLastShelfNum(this.User.AccCode)
+		num_lastdata, _ := utils.StrTo(lastdata[1:]).Int64()
+		lastdata_box := svcshelf.GetLastBoxNum(this.User.AccCode)
+		num_lastdata_box, _ := utils.StrTo(lastdata_box[1:]).Int64()
+		for i := 1; i <= equip.RowNum; i++ {
+			for j := 1; j <= equip.ColumnNum; j++ {
+				var shelfempty shelfset.Shelf
+				shelfempty.AccCode = this.User.AccCode
+				shelfempty.EquipmentId = equip.Id
+				shelfempty.Code = "F" + utils.ToStr(num_lastdata)
+				shelfempty.BarCode = "F" + utils.ToStr(num_lastdata)
+				shelfempty.RowNum = shelf_x_int
+				shelfempty.ColumnNum = shelf_y_int
+				shelfempty.XStation = j
+				shelfempty.YStation = i
+				shelfempty.SampleType = equip.SampleType
+				shelfempty.CreateBy = this.User.Realname
+				shelfempty.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				num_lastdata = num_lastdata + 1
+				_, err = svcshelf.InsertEntity(&shelfempty)
+				sqlfield := " AccCode,EquipmentId,ShelfId,XStation,YStation,RowNum,ColumnNum,"
+				sqlvalue := "'" + this.User.AccCode + "'," + utils.ToStr(equip.Id) + "," + utils.ToStr(shelfempty.Id) + "," + utils.ToStr(j) + "," + utils.ToStr(i) + "," + utils.ToStr(shelf_x_int) + "," + utils.ToStr(shelf_y_int) + ","
+				ii, jj := shelf_x_int, shelf_y_int
+				//添加冻存盒
+				if box_x_int > 0 && box_y_int > 0 {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-1"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-1,"
+							}
+						}
+					}
+					for a := 1; a <= shelf_x_int; a++ {
+						for b := 1; b <= shelf_y_int; b++ {
+							var boxempty shelfset.Box
+							boxempty.AccCode = this.User.AccCode
+							boxempty.EquipmentId = equip.Id
+							boxempty.ShelfId = shelfempty.Id
+							boxempty.Code = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.BarCode = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.YStation = a
+							boxempty.XStation = b
+							boxempty.RowNum = box_x_int
+							boxempty.ColumnNum = box_y_int
+							boxempty.SampleType = equip.SampleType
+							boxempty.CreateBy = this.User.Realname
+							boxempty.CreateBy = this.User.Realname
+							num_lastdata_box = num_lastdata_box + 1
+							_, err = svc.InsertEntity(&boxempty)
+						}
+					}
+				} else {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-2"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-2,"
+							}
+						}
+					}
+				}
+				svc1 := currboxcapacity.GetCurrboxcapacityService(utils.DBE)
+				svc1.Add(sqlfield, sqlvalue)
+			}
+		}
+		num_lastdata_box = num_lastdata_box - 1
+		var lastnum lastordernum.LastOrderNum
+		lastnum.LastNum = "B" + utils.ToStr(num_lastdata_box)
+		svcshelf.UpdateBoxNum(lastnum, this.User.AccCode)
+		num_lastdata = num_lastdata - 1
+		var lastnum_shelf lastordernum.LastOrderNum
+		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
+		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 	} else {
 
 		if model.Shelf_X > 0 && model.Shelf_y > 0 {

src/dashoo.cn/frontend_web/src/layouts/default.vue

@@ -16,6 +16,8 @@
            id="cryobiobank97K_newmodelimg">
       <img src="/img/genepointlite1.jpg" style="width: 300px; height: 300px;display: none;"
            id="GenePointLITE1">
+      <img src="/img/genepointlite2.jpg" style="width: 300px; height: 300px;display: none;"
+           id="GenePointLITE2">
       <div id="divmenudiv" onmouseover="onoverdivmenu()" onmouseout="onoutdivmenu()" class="menudiv">
         <div class="menutext" style="display:none;" id="divmenutext">
         </div>

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

@@ -2871,6 +2871,424 @@
             type: 2
           }
         ],
+        genepointlite2: [ // 23：基点LITE2全自动液氮罐
+          {
+            XStation: 1,
+            YStation: 1,
+            x1: 166,
+            y1: 41,
+            x2: 199,
+            y2: 33,
+            x3: 210,
+            y3: 82,
+            x4: 178,
+            y4: 90,
+            type: 2
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x1: 117,
+            y1: 65,
+            x2: 146,
+            y2: 48,
+            x3: 171,
+            y3: 91,
+            x4: 142,
+            y4: 107,
+            type: 2
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x1: 77,
+            y1: 102,
+            x2: 100,
+            y2: 78,
+            x3: 136,
+            y3: 111,
+            x4: 114,
+            y4: 136,
+            type: 2
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x1: 52,
+            y1: 148,
+            x2: 65,
+            y2: 120,
+            x3: 112,
+            y3: 140,
+            x4: 97,
+            y4: 171,
+            type: 2
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x1: 44,
+            y1: 169,
+            x2: 94,
+            y2: 177,
+            x3: 89,
+            y3: 210,
+            x4: 40,
+            y4: 202,
+            type: 2
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x1: 40,
+            y1: 224,
+            x2: 89,
+            y2: 216,
+            x3: 95,
+            y3: 247,
+            x4: 45,
+            y4: 257,
+            type: 2
+          },
+          {
+            XStation: 7,
+            YStation: 1,
+            x1: 51,
+            y1: 277,
+            x2: 96,
+            y2: 255,
+            x3: 110,
+            y3: 283,
+            x4: 66,
+            y4: 305,
+            type: 2
+          },
+          {
+            XStation: 8,
+            YStation: 1,
+            x1: 78,
+            y1: 323,
+            x2: 115,
+            y2: 290,
+            x3: 137,
+            y3: 313,
+            x4: 100,
+            y4: 347,
+            type: 2
+          },
+          {
+            XStation: 9,
+            YStation: 1,
+            x1: 142,
+            y1: 317,
+            x2: 171,
+            y2: 333,
+            x3: 146,
+            y3: 378,
+            x4: 116,
+            y4: 361,
+            type: 2
+          },
+          {
+            XStation: 10,
+            YStation: 1,
+            x1: 177,
+            y1: 336,
+            x2: 210,
+            y2: 344,
+            x3: 198,
+            y3: 392,
+            x4: 166,
+            y4: 386,
+            type: 2
+          },
+          {
+            XStation: 11,
+            YStation: 1,
+            x1: 216,
+            y1: 344,
+            x2: 250,
+            y2: 341,
+            x3: 253,
+            y3: 391,
+            x4: 220,
+            y4: 394,
+            type: 2
+          },
+          {
+            XStation: 12,
+            YStation: 1,
+            x1: 256,
+            y1: 340,
+            x2: 286,
+            y2: 328,
+            x3: 305,
+            y3: 374,
+            x4: 274,
+            y4: 387,
+            type: 2
+          },
+          {
+            XStation: 13,
+            YStation: 1,
+            x1: 292,
+            y1: 325,
+            x2: 318,
+            y2: 305,
+            x3: 350,
+            y3: 344,
+            x4: 324,
+            y4: 364,
+            type: 2
+          },
+          {
+            XStation: 14,
+            YStation: 1,
+            x1: 343,
+            y1: 272,
+            x2: 385,
+            y2: 301,
+            x3: 365,
+            y3: 329,
+            x4: 322,
+            y4: 301,
+            type: 2
+          },
+          {
+            XStation: 15,
+            YStation: 1,
+            x1: 354,
+            y1: 235,
+            x2: 403,
+            y2: 250,
+            x3: 394,
+            y3: 282,
+            x4: 344,
+            y4: 268,
+            type: 2
+          },
+          {
+            XStation: 16,
+            YStation: 1,
+            x1: 355,
+            y1: 196,
+            x2: 405,
+            y2: 196,
+            x3: 405,
+            y3: 229,
+            x4: 355,
+            y4: 229,
+            type: 2
+          },
+          {
+            XStation: 17,
+            YStation: 1,
+            x1: 344,
+            y1: 160,
+            x2: 392,
+            y2: 144,
+            x3: 403,
+            y3: 176,
+            x4: 354,
+            y4: 190,
+            type: 2
+          },
+          {
+            XStation: 18,
+            YStation: 1,
+            x1: 322,
+            y1: 126,
+            x2: 365,
+            y2: 97,
+            x3: 385,
+            y3: 124,
+            x4: 342,
+            y4: 153,
+            type: 2
+          },
+          {
+            XStation: 19,
+            YStation: 1,
+            x1: 324,
+            y1: 61,
+            x2: 351,
+            y2: 81,
+            x3: 319,
+            y3: 122,
+            x4: 292,
+            y4: 101,
+            type: 2
+          },
+          {
+            XStation: 20,
+            YStation: 1,
+            x1: 274,
+            y1: 38,
+            x2: 306,
+            y2: 50,
+            x3: 287,
+            y3: 97,
+            x4: 256,
+            y4: 86,
+            type: 2
+          },
+          {
+            XStation: 21,
+            YStation: 1,
+            x1: 220,
+            y1: 32,
+            x2: 253,
+            y2: 34,
+            x3: 249,
+            y3: 83,
+            x4: 216,
+            y4: 81,
+            type: 2
+          },
+          {
+            XStation: 22,
+            YStation: 1,
+            x1: 188,
+            y1: 96,
+            x2: 222,
+            y2: 91,
+            x3: 231,
+            y3: 141,
+            x4: 196,
+            y4: 146,
+            type: 2
+          },
+          {
+            XStation: 23,
+            YStation: 1,
+            x1: 130,
+            y1: 132,
+            x2: 156,
+            y2: 111,
+            x3: 189,
+            y3: 149,
+            x4: 164,
+            y4: 170,
+            type: 2
+          },
+          {
+            XStation: 24,
+            YStation: 1,
+            x1: 111,
+            y1: 163,
+            x2: 159,
+            y2: 177,
+            x3: 150,
+            y3: 209,
+            x4: 100,
+            y4: 195,
+            type: 2
+          },
+          {
+            XStation: 25,
+            YStation: 1,
+            x1: 150,
+            y1: 216,
+            x2: 160,
+            y2: 247,
+            x3: 110,
+            y3: 263,
+            x4: 100,
+            y4: 231,
+            type: 2
+          },
+          {
+            XStation: 26,
+            YStation: 1,
+            x1: 164,
+            y1: 254,
+            x2: 189,
+            y2: 276,
+            x3: 156,
+            y3: 314,
+            x4: 130,
+            y4: 293,
+            type: 2
+          },
+          {
+            XStation: 27,
+            YStation: 1,
+            x1: 196,
+            y1: 280,
+            x2: 230,
+            y2: 284,
+            x3: 222,
+            y3: 334,
+            x4: 189,
+            y4: 330,
+            type: 2
+          },
+          {
+            XStation: 28,
+            YStation: 1,
+            x1: 268,
+            y1: 270,
+            x2: 289,
+            y2: 314,
+            x3: 258,
+            y3: 329,
+            x4: 236,
+            y4: 282,
+            type: 2
+          },
+          {
+            XStation: 29,
+            YStation: 1,
+            x1: 292,
+            y1: 236,
+            x2: 336,
+            y2: 264,
+            x3: 317,
+            y3: 292,
+            x4: 273,
+            y4: 265,
+            type: 2
+          },
+          {
+            XStation: 30,
+            YStation: 1,
+            x1: 294,
+            y1: 196,
+            x2: 344,
+            y2: 196,
+            x3: 344,
+            y3: 229,
+            x4: 295,
+            y4: 229,
+            type: 2
+          },
+          {
+            XStation: 31,
+            YStation: 1,
+            x1: 273,
+            y1: 161,
+            x2: 316,
+            y2: 133,
+            x3: 335,
+            y3: 162,
+            x4: 294,
+            y4: 189,
+            type: 2
+          },
+          {
+            XStation: 32,
+            YStation: 1,
+            x1: 258,
+            y1: 96,
+            x2: 289,
+            y2: 110,
+            x3: 268,
+            y3: 156,
+            x4: 237,
+            y4: 142,
+            type: 2
+          }
+        ],
         waituploads: [], // 等待上传的附件列表
         downloadTemplates: [{
           Name: "默认模版"
@@ -2946,8 +3364,10 @@
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr
               } else if (_this.yedanguanitem === 21) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
-              } else {
+              } else if (_this.yedanguanitem === 22) {
                 yedanguandatarrtrmp = _this.genepointlite1
+              } else {
+                yedanguandatarrtrmp = _this.genepointlite2
               }
               for (let i = 0; i < yedanguandatarrtrmp.length; i++) {
                 if ((yedanguandatarrtrmp[i].XStation + '') === stationarr[0] && (yedanguandatarrtrmp[i].YStation +
@@ -3063,7 +3483,7 @@
               _this.showtsyedanguan = false
               _this.showcgshebei = true
               _this.fridgebottomimg = _this.filehost + '/static/img/sampletypeimg/bottomydg.png'
-            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21 || res.data.DItem === 22)) {
+            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21 || res.data.DItem === 22 || res.data.DItem === 23)) {
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
@@ -3071,8 +3491,10 @@
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_bloodbagimg'
               } else if (res.data.DItem === 21) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
-              } else {
+              } else if (res.data.DItem === 22) {
                 _this.yeshuyedanguanimgid = 'GenePointLITE1'
+              } else {
+                _this.yeshuyedanguanimgid = 'GenePointLITE2'
               }
               // 加载特殊液氮罐
               _this.drawyedanguancanvasbgimg()
@@ -3111,8 +3533,10 @@
           yedanguandatarrtrmp = _this.yedanguanrongqiarr
         } else if (_this.yedanguanitem === 21) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
-        } else {
+        } else if (_this.yedanguanitem === 22) {
           yedanguandatarrtrmp = _this.genepointlite1
+        } else {
+          yedanguandatarrtrmp = _this.genepointlite2
         }
         yedanguandatarrtrmp.forEach(function (v) {
           // 绘制颜色快

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/operation.vue

@@ -385,6 +385,12 @@
                     _this.haveshelf = true
                     _this.showdchdcj = false
                     break
+                  case 23:
+                    _this.formmodel.RowNum = '1'
+                    _this.formmodel.ColumnNum = '32'
+                    _this.haveshelf = true
+                    _this.showdchdcj = false
+                    break
                   default:
                     _this.formmodel.RowNum = '1'
                     _this.formmodel.ColumnNum = '1'

src/dashoo.cn/frontend_web/src/pages/equipment/index.vue

@@ -63,7 +63,7 @@
               <router-link :to="'/equipment/' + v.Equipment.Id + '/manage_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">样本录入</el-button>
               </router-link>
-              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21 && v.Equipment.DItem !== 22" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21 && v.Equipment.DItem !== 22 && v.Equipment.DItem !== 23" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">设置</el-button>
               </router-link>
               <el-button type="primary" size="mini" @click="copy(v.Equipment.Id, v.Equipment.Code)">复制</el-button>