productDev/dmMes.git

			@@ -2,7 +2,8 @@
			<view>
			<InOutInfo :info="info" />
			<uni-collapse @change="change" @close="close" @open="open">
			<uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7" v-for="(item1, index) in warehouseList" :key="index">
			<uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7"
			v-for="(item1, index) in warehouseList" :key="index">
			<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
			<image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
			<view>{{ item1.warehouseName }}</view>
			@@ -33,7 +34,7 @@
			<span>{{item.batch ? item.batch : '-'}}</span>
			</div>
			</div>
			<div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" v-if="childer.batch == item.batch" :key="idxs">
			<div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
			<div class="page_content_list_item">
			<div class="page_content_list_item_label">出库货位：</div>
			<div class="page_content_list_item_nr">{{ childer.locationName }}</div>
			@@ -69,18 +70,15 @@
			<span>待出 <span>{{ item.num }}</span> {{ item.unitName }}</span>
			</div>
			<div class="page_content_title_bottom">
			<span class="green" v-if="item.qualityType === 0">合格 <span
			class="black">/</span> </span>
			<span class="warning" v-else-if="item.qualityType === 1">不良 <span
			class="black">/</span> </span>
			<span class="error" v-else-if="item.qualityType === 2">报废 <span
			class="black">/</span> </span>
			<span v-else>- / </span>
			<span>{{item.procedureName ? item.procedureName : '-'}} / </span>
			<span class="green" v-if="item.qualityType === 0">合格<text class="c6" decode>{{ split}}</text></span>
			<span class="warning" v-else-if="item.qualityType === 1">不良<text class="c6" decode>{{ split}}</text></span>
			<span class="error" v-else-if="item.qualityType === 2">报废<text class="c6" decode>{{ split}}</text></span>
			<span v-else>-<text class="c6" decode>{{ split}}</text></span>
			<span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
			<span>{{item.batch ? item.batch : '-'}}</span>
			</div>
			</div>
			<div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" v-if="items.batch == item.batch" :key="ind">
			<div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
			<div class="page_content_list_item">
			<div class="page_content_list_item_label">批次号1：</div>
			<div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
			@@ -108,7 +106,8 @@
			</div>

			<div class="right" v-if="isZKD" @click="openxz">
			<image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>手动出库</span>
			<image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image>
			<span>手动出库</span>
			</div>
			</div>
			<div class="page_yxwl_list" v-if="outboundList.length > 0">
			@@ -119,12 +118,12 @@

			</div>
			<div class="page_yxwl_list_item_sx">
			<span class="green" v-if="item.qualityType == 0">合格 <span>/</span></span>
			<span class="yellow" v-else-if="item.qualityType == 1">不良 <span>/</span></span>
			<span class="red" v-else-if="item.qualityType == 2">报废 <span>/</span></span>
			<span v-else>- / </span>
			<span> {{ item.procedureName ? item.procedureName : '-' }} / </span>
			<span> {{ item.batch ? item.batch : '-' }}</span>
			<span class="green" v-if="item.qualityType == 0">合格t<text class="c6" decode>{{ split}}</text></span>
			<span class="yellow" v-else-if="item.qualityType == 1">不良<text class="c6" decode>{{ split}}</text></span>
			<span class="red" v-else-if="item.qualityType == 2">报废<text class="c6" decode>{{ split}}</text></span>
			<span v-else>-<text class="c6" decode>{{ split}}</text></span>
			<span>{{ item.procedureName ? item.procedureName : '-' }}<text class="c6" decode>{{ split}}</text></span>
			<span>{{ item.batch ? item.batch : '-' }}</span>
			</div>
			<div class="page_yxwl_list_item_num">
			<div class="item">
			@@ -133,7 +132,7 @@
			<span>{{ item.locationName }}</span>
			</div>
			</div>
			<div class="item">
			<div class="item f24">
			<div class="label">数量：</div>
			<div class="nr">
			<!-- @input="changeNum(item)" -->
			@@ -143,7 +142,7 @@
			</div>
			<div class="dele" @click="dele(index)">
			<!-- <img src="@/assets/icon/chuku_ic_delete@2x.png" alt="" /> -->
			<image src="../../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
			<image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
			</div>
			</div>
			</div>
			@@ -193,6 +192,7 @@
			info: {

			},
			split: ' / ',
			mainOrder: '',
			warehouseId: '',
			ids: [],
			@@ -269,34 +269,58 @@
			},
			selectMaterail(v) {
			let tempList = this.warehouseList[0].wtransferDetailList
			let materials = v.materials

			materials.forEach(materail => {

			let materials = JSON.parse(JSON.stringify(v.materials))
			tempList.forEach(item => {
			item.wstockExtListVOList.forEach(hw => {
			if (materail.materialId == hw.materialId && materail.procedureId == hw
			.procedureId && materail.qualityType == hw.qualityType && materail.batch ==
			hw.batch) {
			let isExist = false
			let isOutList = false
			this.outboundList.forEach(selected => {
			if (selected.newId == item.id) {
			isOutList = true
			return
			}
			})
			if (!isOutList) {
			materials.forEach((materail, index) => {
			if (item.batch) {
			// 精确匹配
			if (materail.materialId == item.materialId &&
			materail.procedureId == item.procedureId &&
			materail.qualityType == item.qualityType &&
			materail.batch == item.batch
			) {
			this.addToOutList(materail, item)
			materials.splice(index, 1)
			return
			}
			} else {
			if (materail.materialId == item.materialId &&
			materail.procedureId == item.procedureId &&
			materail.qualityType == item.qualityType
			) {
			this.addToOutList(materail, item)
			materials.splice(index, 1)
			return
			}
			}
			})
			}
			})
			},
			addToOutList(materail, item) {
			let isExist = false
			this.outboundList.forEach(selected => {
			if (selected.newId == materail.id) {
			isExist = true
			return
			}
			})
			if (isExist) {
			uni.$u.toast('该物料已存在')
			return
			}
			} else {
			let obj = JSON.parse(JSON.stringify(materail))
			obj.newId = item.id
			this.outboundList.push(obj)
			console.log(this.outboundList);
			}
			})

			})
			})
			},
			dele(index) {
			this.outboundList.splice(index, 1)
			@@ -664,6 +688,7 @@
			display: flex;
			align-items: center;
			margin-top: 15rpx;
			font-size: 24rpx;
			}

			.page_yxwl_list_item_num {
			@@ -748,6 +773,7 @@
			left: 30rpx;
			padding-bottom: 68rpx;
			z-index: 9999;

			.page_footer_qr {
			flex: 1;
			height: 88rpx;