|
|
@@ -320,25 +320,25 @@ export default {
|
|
|
ypInfoList.forEach(item => {
|
|
|
allUUID.push(item.biao_zhi_uuid_1, item.biao_zhi_uuid_2, item.biao_zhi_uuid_3, item.biao_zhi_uuid_4)
|
|
|
let allResult = []
|
|
|
- allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_yi, '否', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
|
|
|
if (item.shou_yang_wei_zhi_er != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_er, '否', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
|
|
|
}
|
|
|
if (item.shou_yang_wei_zhi_san != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_san, '否', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_san, '否', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime,item.yang_pin_lei_san_,item.liu_yang_shu_lian_san))
|
|
|
}
|
|
|
if (item.shou_yang_wei_zhi_si != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.shou_yang_wei_zhi_si, '否', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
|
|
|
}
|
|
|
- allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_yi, '是', localInfo, locationIds, item, item.biao_zhi_uuid_1, currentTime,item.yang_pin_lei_xing,item.liu_yang_shu_lian_yi))
|
|
|
if (item.liu_yang_wei_zhi_er != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_er, '是', localInfo, locationIds, item, item.biao_zhi_uuid_2, currentTime,item.yang_pin_lei_er_,item.liu_yang_shu_lian_er))
|
|
|
}
|
|
|
if (item.liu_yang_wei_zhi_san != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_san, '是', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_san, '是', localInfo, locationIds, item, item.biao_zhi_uuid_3, currentTime,item.yang_pin_lei_san_,item.liu_yang_shu_lian_san))
|
|
|
}
|
|
|
if (item.liu_yang_wei_zhi_si != undefined) {
|
|
|
- allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_si, '是', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime))
|
|
|
+ allResult.push(this.handleLocationInfo(item.liu_yang_wei_zhi_si, '是', localInfo, locationIds, item, item.biao_zhi_uuid_4, currentTime,item.yang_pin_lei_si_,item.liu_yang_shu_lian_si))
|
|
|
}
|
|
|
allResult.forEach(item => {
|
|
|
item.name === 'emptyLocation' ? this.emptyLocal.push(item.value) : this.fullLocal.push(item.value)
|
|
|
@@ -554,13 +554,15 @@ export default {
|
|
|
yang_pin_ming_che: sampleInfo.yang_pin_ming_che,
|
|
|
ru_ku_shi_jian_: sampleInfo.ru_ku_shi_jian_,
|
|
|
shi_fou_liu_yang_: sampleInfo.shi_fou_liu_yang_,
|
|
|
- biao_zhi_uuid_: sampleInfo.biao_zhi_uuid_
|
|
|
+ biao_zhi_uuid_: sampleInfo.biao_zhi_uuid_,
|
|
|
+ yang_pin_lei_xing: sampleInfo.type,
|
|
|
+ liu_yang_shu_lian: sampleInfo.num
|
|
|
}
|
|
|
return temp
|
|
|
},
|
|
|
- handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime) {
|
|
|
+ handleLocationInfo(currentLocation, isLiuYang, localInfo, locationIds, item, UUID, currentTime,sampleType,liuYangNum) {
|
|
|
!locationIds.has(currentLocation) ? locationIds.add(currentLocation) : localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta = '占用'
|
|
|
- console.log(localInfo.find(i => i.id_ === currentLocation), currentLocation)
|
|
|
+ // console.log(localInfo.find(i => i.id_ === currentLocation), currentLocation)
|
|
|
if (localInfo.find(i => i.id_ === currentLocation).wei_zhi_zhuang_ta === '空余') {
|
|
|
let obj = {
|
|
|
where: {
|
|
|
@@ -571,7 +573,9 @@ export default {
|
|
|
ru_ku_shi_jian_: currentTime,
|
|
|
yang_pin_bian_hao: item.yang_pin_bian_hao,
|
|
|
yang_pin_ming_che: item.yang_pin_ming_che,
|
|
|
- shi_fou_liu_yang_: isLiuYang
|
|
|
+ shi_fou_liu_yang_: isLiuYang,
|
|
|
+ yang_pin_lei_xing: sampleType,
|
|
|
+ liu_yang_shu_lian: liuYangNum
|
|
|
}
|
|
|
}
|
|
|
let result = {
|
|
|
@@ -585,7 +589,9 @@ export default {
|
|
|
yang_pin_ming_che: item.yang_pin_ming_che,
|
|
|
ru_ku_shi_jian_: currentTime,
|
|
|
biao_zhi_uuid_: UUID,
|
|
|
- shi_fou_liu_yang_: isLiuYang
|
|
|
+ shi_fou_liu_yang_: isLiuYang,
|
|
|
+ type: sampleType,
|
|
|
+ num: liuYangNum
|
|
|
}
|
|
|
let newLocation = this.generateNewLocation(localInfo.find(i => i.id_ === currentLocation), sampleInfo)
|
|
|
let result = {
|
ZZJ