From 28133ed9b6e9b9b211970946c28817b285ddc95f Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 10 May 2023 16:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  12 +
 pages/management/SemifinishedInStore.vue      | 163 ++++++++++++
 .../management/SemifinishedInStoreSearch.vue  | 245 ++++++++++++++++++
 pages/management/SemifinishedOutStore.vue     | 163 ++++++++++++
 .../management/SemifinishedOutStoreSearch.vue | 245 ++++++++++++++++++
 utils/getData2.js                             |  12 +-
 6 files changed, 835 insertions(+), 5 deletions(-)
 create mode 100644 pages/management/SemifinishedInStore.vue
 create mode 100644 pages/management/SemifinishedInStoreSearch.vue
 create mode 100644 pages/management/SemifinishedOutStore.vue
 create mode 100644 pages/management/SemifinishedOutStoreSearch.vue

diff --git a/pages.json b/pages.json
index 939782f..1b8c96a 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,18 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/management/SemifinishedInStore",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/management/SemifinishedOutStore",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/management/semifinishedcheck",
 			"style": {
diff --git a/pages/management/SemifinishedInStore.vue b/pages/management/SemifinishedInStore.vue
new file mode 100644
index 0000000..cde00d9
--- /dev/null
+++ b/pages/management/SemifinishedInStore.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="content">
+		<nav-bar title="半成品入库"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">仓库</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">单据类型</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">物料</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val1">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">规格</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val2">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">数量(个)</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val3">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">单重(g)</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val4">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">入库点</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">载具号</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val5"
+						/>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">备注</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val6">
+					</view>
+				</view>
+			</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toDelect">呼叫空载具</button>
+				<button class="confirm-button" @tap="toSelect">作业查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1}" :disabled="disabled" @tap="toSure">确认入库</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: 'A1',
+				options2: [],
+				index2: 'A1',
+				options3: [],
+				index3: 'A1',
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				val6: '',
+				disabled: false
+			};
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicArr', '')
+		},
+		created () {
+			// this._finishproductPoint()
+		},
+		methods: {
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+			},
+			toDelect () {
+			  this.$store.dispatch('setPublicArr', '')
+			},
+			async _finishproductPoint () {
+				let res = await finishproductPoint('1')
+				this.options1 = [...res]
+			},
+			async toSure () {
+			  this.disabled = true
+			  if (!this.index1) {
+				uni.showToast({
+					title: '请选择入库点',
+					icon: 'none'
+				})
+				this.disabled = false
+				return
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请输入载具号',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  try {
+				let res = await InstoreOrder(this.index1, this.val1) 
+				this.disabled = false
+				this.index1 = ''
+				this.val1 = ''
+				this.toDelect()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			},
+			toSelect () {
+				uni.navigateTo({
+					url: '/pages/management/MaterList'
+				})
+			}
+		}
+	}
+</script>
diff --git a/pages/management/SemifinishedInStoreSearch.vue b/pages/management/SemifinishedInStoreSearch.vue
new file mode 100644
index 0000000..b700770
--- /dev/null
+++ b/pages/management/SemifinishedInStoreSearch.vue
@@ -0,0 +1,245 @@
+<template>
+	<view class="content">
+		<nav-bar title="半成品入库查询"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">仓库</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">开始日期</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">结束日期</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">业务类型</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">物料</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">载具号</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch">查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">强制确认</button>
+			</view>
+		</view>
+		<view class="grid-wrap zd_wrapper">
+			<view class="slide_new">
+				<table class="grid-table">
+					<thead>
+						<tr>
+							<th>选择</th>
+							<th>序号</th>
+							<th>单据号</th>
+							<th>状态</th>
+							<th>类型</th>
+							<th>物料编号</th>
+							<th>物料名称</th>
+							<th>数量</th>
+							<th>单重(g)</th>
+							<th>载具号</th>
+							<th>入库点</th>
+							<th>货位</th>
+							<th>创建时间</th>
+							<th>创建人</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
+							<td>
+								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
+							</td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td></td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td></td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+						</tr>
+					</tbody>
+				</table>
+			</view>
+		</view>
+		<view>
+			<uni-calendar 
+			ref="calendar1"
+			:insert="false"
+			:date="startDate"
+			@confirm="confirm1"
+			/>
+		</view>
+		<view>
+			<uni-calendar 
+			ref="calendar2"
+			:insert="false"
+			:date="endDate"
+			@confirm="confirm2"
+			/>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
+	import {dateFtt} from '@/utils/utils.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				startDate: dateFtt(new Date()),
+				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
+				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index1: 'A1',
+				options2: [],
+				index2: '',
+				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
+				index3: '1',
+				val1: '',
+				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
+				pkId: '',
+				disabled: false
+			};
+		},
+		created() {
+		},
+		methods: {
+			open1(){
+				this.$refs.calendar1.open()
+			},
+			confirm1(e) {
+				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
+				if (compare < 0) {
+					this.startDate = e.fulldate
+				}
+			},
+			open2(){
+				this.$refs.calendar2.open()
+			},
+			confirm2(e) {
+				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
+				if (compare > 0) {
+					this.endDate = e.fulldate
+				}
+			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				if (this.index1) {
+					this._getCacheLine(e)
+				}
+				this.index2 = ''
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+			},
+			toSearch () {
+			  this.dataList = []
+			  this.pkId = ''
+			  this._inOutExceptionInstQuery()
+			},
+			async _getCacheLine (id) {
+				let res = await getCacheLine(id)
+				this.options2 = [...res]
+			},
+			async _inOutExceptionInstQuery () {
+				let res = await inOutExceptionInstQuery(this.index2)
+				this.dataList = [...res]
+			},
+			async toSure () {
+			  this.disabled = true
+			  if (!this.pkId) {
+				uni.showToast({
+					title: '请选择',
+					icon: 'none'
+				})
+				this.disabled = false
+				return
+			  }
+			  if (!this.index2) {
+				uni.showToast({
+					title: '请选择缓存线',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.index3) {
+				uni.showToast({
+					title: '请选择位置类型',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请扫满箱码',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  try {
+				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
+				this.disabled = false
+				this.toSearch()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			},
+			toRadio (e) {
+			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.grid-wrap	
+    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+/deep/ .uni-calendar-item__weeks-box-item
+	height: 40px !important
+</style>
\ No newline at end of file
diff --git a/pages/management/SemifinishedOutStore.vue b/pages/management/SemifinishedOutStore.vue
new file mode 100644
index 0000000..e2c0300
--- /dev/null
+++ b/pages/management/SemifinishedOutStore.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="content">
+		<nav-bar title="半成品出库"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">仓库</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">单据类型</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">物料</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val1">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">规格</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val2">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">数量(个)</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val3">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">单重(g)</label>
+					<view class="filter_input_wraper">
+						<input type="number" class="search-input-l" v-model="val4">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">入库点</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">载具号</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val5"
+						/>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">备注</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val6">
+					</view>
+				</view>
+			</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toDelect">呼叫空载具</button>
+				<button class="confirm-button" @tap="toSelect">作业查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !index1 || !val1}" :disabled="disabled" @tap="toSure">确认入库</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {finishproductPoint, InstoreOrder} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: 'A1',
+				options2: [],
+				index2: 'A1',
+				options3: [],
+				index3: 'A1',
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				val6: '',
+				disabled: false
+			};
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicArr', '')
+		},
+		created () {
+			// this._finishproductPoint()
+		},
+		methods: {
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+			},
+			toDelect () {
+			  this.$store.dispatch('setPublicArr', '')
+			},
+			async _finishproductPoint () {
+				let res = await finishproductPoint('1')
+				this.options1 = [...res]
+			},
+			async toSure () {
+			  this.disabled = true
+			  if (!this.index1) {
+				uni.showToast({
+					title: '请选择入库点',
+					icon: 'none'
+				})
+				this.disabled = false
+				return
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请输入载具号',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  try {
+				let res = await InstoreOrder(this.index1, this.val1) 
+				this.disabled = false
+				this.index1 = ''
+				this.val1 = ''
+				this.toDelect()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			},
+			toSelect () {
+				uni.navigateTo({
+					url: '/pages/management/MaterList'
+				})
+			}
+		}
+	}
+</script>
diff --git a/pages/management/SemifinishedOutStoreSearch.vue b/pages/management/SemifinishedOutStoreSearch.vue
new file mode 100644
index 0000000..2cb8cf2
--- /dev/null
+++ b/pages/management/SemifinishedOutStoreSearch.vue
@@ -0,0 +1,245 @@
+<template>
+	<view class="content">
+		<nav-bar title="半成品出库查询"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">仓库</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">开始日期</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="startDate"  @click="open1">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">结束日期</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="endDate"  @click="open2">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">业务类型</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">物料</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val1" placeholder="编号/名称">
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">载具号</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch">查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">强制确认</button>
+			</view>
+		</view>
+		<view class="grid-wrap zd_wrapper">
+			<view class="slide_new">
+				<table class="grid-table">
+					<thead>
+						<tr>
+							<th>选择</th>
+							<th>序号</th>
+							<th>单据号</th>
+							<th>状态</th>
+							<th>类型</th>
+							<th>物料编号</th>
+							<th>物料名称</th>
+							<th>数量</th>
+							<th>单重(g)</th>
+							<th>载具号</th>
+							<th>入库点</th>
+							<th>货位</th>
+							<th>创建时间</th>
+							<th>创建人</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="e in dataList" :key="e.position_code"  @click="toRadio(e)">
+							<td>
+								<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
+							</td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td></td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td></td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+							<td>{{e.vehicle_code}}</td>
+							<td>{{e.cacheline_code}}</td>
+							<td>{{e.position_code}}</td>
+						</tr>
+					</tbody>
+				</table>
+			</view>
+		</view>
+		<view>
+			<uni-calendar 
+			ref="calendar1"
+			:insert="false"
+			:date="startDate"
+			@confirm="confirm1"
+			/>
+		</view>
+		<view>
+			<uni-calendar 
+			ref="calendar2"
+			:insert="false"
+			:date="endDate"
+			@confirm="confirm2"
+			/>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getCacheLine, inOutExceptionInstQuery, inOutExceptionInstConfirm} from '@/utils/getData2.js'
+	import {dateFtt} from '@/utils/utils.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				startDate: dateFtt(new Date()),
+				endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
+				options1: [{text: 'A1', value: 'A1'}, {text: 'A2', value: 'A2'}],
+				index1: 'A1',
+				options2: [],
+				index2: '',
+				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
+				index3: '1',
+				val1: '',
+				dataList: [{position_code: '1', vehicle_code: 'djlfjjljlkllkllldf', cacheline_code: 'jfjldfjl'}, {position_code: '2', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '21', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '22', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '23', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '24', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '25', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '26', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '27', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}, {position_code: '29', vehicle_code: 'djlfjldf', cacheline_code: 'jfjldfjl'}],
+				pkId: '',
+				disabled: false
+			};
+		},
+		created() {
+		},
+		methods: {
+			open1(){
+				this.$refs.calendar1.open()
+			},
+			confirm1(e) {
+				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.endDate))
+				if (compare < 0) {
+					this.startDate = e.fulldate
+				}
+			},
+			open2(){
+				this.$refs.calendar2.open()
+			},
+			confirm2(e) {
+				var compare = Date.parse(new Date(e.fulldate)) - Date.parse(new Date(this.startDate))
+				if (compare > 0) {
+					this.endDate = e.fulldate
+				}
+			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				if (this.index1) {
+					this._getCacheLine(e)
+				}
+				this.index2 = ''
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+			},
+			toSearch () {
+			  this.dataList = []
+			  this.pkId = ''
+			  this._inOutExceptionInstQuery()
+			},
+			async _getCacheLine (id) {
+				let res = await getCacheLine(id)
+				this.options2 = [...res]
+			},
+			async _inOutExceptionInstQuery () {
+				let res = await inOutExceptionInstQuery(this.index2)
+				this.dataList = [...res]
+			},
+			async toSure () {
+			  this.disabled = true
+			  if (!this.pkId) {
+				uni.showToast({
+					title: '请选择',
+					icon: 'none'
+				})
+				this.disabled = false
+				return
+			  }
+			  if (!this.index2) {
+				uni.showToast({
+					title: '请选择缓存线',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.index3) {
+				uni.showToast({
+					title: '请选择位置类型',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  if (!this.val1) {
+				uni.showToast({
+					title: '请扫满箱码',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
+			  try {
+				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
+				this.disabled = false
+				this.toSearch()
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			},
+			toRadio (e) {
+			  this.pkId = this.pkId === e.position_code ? '' : e.position_code
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.grid-wrap	
+    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+/deep/ .uni-calendar-item__weeks-box-item
+	height: 40px !important
+</style>
\ No newline at end of file
diff --git a/utils/getData2.js b/utils/getData2.js
index efb49e3..7a10455 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -40,8 +40,10 @@ export const authority = () => {
 				{menu_id: '1', name: '半成品入库', path: '/pages/management/HalfFinishedInStore'},
 				{menu_id: '2', name: '成品入库', path: '/pages/management/FinishedInStore'},
 				{menu_id: '3', name: '发货确认', path: '/pages/management/DeliveryConfirm'},
-				{menu_id: '4', name: '半成品盘点', path: '/pages/management/semifinishedcheck'},
-				{menu_id: '5', name: '半成品拼盘', path: '/pages/management/semifinishedcompose'}
+				{menu_id: '4', name: '半成品入库', path: '/pages/management/SemifinishedInStore'},
+				{menu_id: '5', name: '半成品出库', path: '/pages/management/SemifinishedOutStore'},
+				{menu_id: '6', name: '半成品盘点', path: '/pages/management/semifinishedcheck'},
+				{menu_id: '7', name: '半成品拼盘', path: '/pages/management/semifinishedcompose'}
 				]
 			}
 		]
@@ -149,9 +151,9 @@ export const releasepoint = (point, code, option) => request({
 export const semiProductInFromPda = (id, mid, qty, code) => request({
 	url:'api/in/semiProductIn/semiProductInFromPda',
 	data: {
-		iostorinv_id: id,
-		material_id: mid,
-		plan_qty: qty,
+		iostorinv_id: id,
+		material_id: mid,
+		plan_qty: qty,
 		storagevehicle_code: code
 	}
 })