change

manifest.json

@@ -2,8 +2,8 @@
     "name" : "欧伦",
     "appid" : "__UNI__DE2F207",
     "description" : "欧伦WMS手持系统",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
-    "versionCode" : 105,
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/common/mater-list.vue

@@ -81,6 +81,11 @@
 				this._getMaterialList()
 			},
 			async _getMaterialList () {
+				alert(this.$route.query.code + 666)
+				// uni.showToast({
+				// 	title: this.$route.query.code,
+				// 	icon: 'none'
+				// })
 				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '', this.$route.query.code)
 				// this.dataList = res.data
 				this.totalCount = res.totalElements

pages/home/home.vue

@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
-					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]},
+					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]},
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
 					// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},

pages/outbound/line-callmater.vue

@@ -36,22 +36,22 @@
 							<tr>
 								<th>物料名称</th>
 								<th>数量</th>
+								<th>物料规格</th>
 								<th>物料编码</th>
 								<th>批次号</th>
 								<th>库位</th>
 								<th>单位</th>
-								<th>物料规格</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
 								<td>{{e.material_name}}</td>
 								<td>{{e.qty}}</td>
+								<td>{{e.material_spec}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.pcsn}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.material_spec}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -195,6 +195,12 @@
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.pkId = ''
+				this.pkObj = {}
+				this.dataList = []
 			}
 		}
 	}

pages/outbound/line-transfer.vue

@@ -14,6 +14,16 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">起点点位</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">站点类型</span>
@@ -24,7 +34,7 @@
 				</view>
 				<view class="zd-row border-bottom" v-show="index !== '2'">
 					<view class="zd-col-7">
-						<span class="filter_label">目标站点</span>
+						<span class="filter_label">终点站点</span>
 					</view>
 					<view class="zd-col-17">
 						<input type="text" class="filter_input" v-model="val2">
@@ -60,6 +70,7 @@
 			return {
 				title: '',
 				val1: '',
+				val3: '',
 				val2: '',
 				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
 				index: '',
@@ -104,12 +115,12 @@
 			},
 			async _transferConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val3 || !this.val1 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await transferConfirm(this.val1, this.val2, this.index2)
+					let res = await transferConfirm(this.val3, this.val1, this.val2, this.index2)
 					if (res.code === '200') {
 						uni.showToast({
 							title: res.message,

pages/outbound/quhuo-confirm.vue

@@ -84,7 +84,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id || (this.isChecked && !this.index)}" :disabled="disabled" @tap="_confirm('1')">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id || (this.isChecked && !this.index)}" :disabled="disabled" @tap="_confirm('1')">确认</button>
 		</view>
 	</view>
 </template>

utils/getData3.js

@@ -112,9 +112,9 @@ export const bindOrUnbind = (siteCode, shelfCode, mode) => request({
 	data: {siteCode: siteCode, shelfCode: shelfCode, mode: mode}
 })
 // 转运确认
-export const transferConfirm = (scode, siteCode, rcode) => request({
+export const transferConfirm = (pointCode, scode, siteCode, rcode) => request({
 	url:'api/pda/iosOut/transferConfirm',
-	data: {storagevehicle_code: scode, siteCode: siteCode, region_code: rcode}
+	data: {pointCode: pointCode, storagevehicle_code: scode, siteCode: siteCode, region_code: rcode}
 })
 // 空载具/CTU出库确认
 export const vehicleOutConfirm = (sid, siteCode, qty) => request({