补充功能

api/dlapi.js

@@ -223,5 +223,28 @@ export function apiYrkw(params){
 		return filter(e)
 	})
 }
-
+//工位查托盘
+export function apiSearchTpByGwid(params){
+	return http.post("/xgwcs/tp/searchTpByGwid", params || {}).then(e => {
+		return filter(e)
+	})
+}
+/* 清空托盘 */
+export function apiEmptyTpByGwid(params){
+	return http.post("/xgwcs/tp/emptyTpByGwid", params || {}).then(e => {
+		return filter(e)
+	})
+}
+/* 扫描地码 */
+export function apiSearchGwByCode(params){
+	return http.post("/xgwcs/gw/searchGwByCode", params || {}).then(e => {
+		return filter(e)
+	})
+}
+/* 清空工位 */
+export function apiEmptyGw(params){
+	return http.post("/xgwcs/gw/emptyGw", params || {}).then(e => {
+		return filter(e)
+	})
+}
 

common/router/modules/routes.js

@@ -153,8 +153,17 @@ const routes = [
 	    meta: {
 	        title: '移入移出',
 	    },
+	},
+	/* 库位清空 */
+	{
+	    path: '/pages/dl_kw_adjust/index',
+	    name: 'kwAdjust',
+	    meta: {
+	        title: '清空库位',
+	    },
 	}
 	
 	
+	
 ]
 export default routes
\ No newline at end of file

components/InfoCard/InfoCard.vue

@@ -147,6 +147,7 @@
 	.infoBody{
 		display: flex;
 		flex-wrap: wrap;
+		overflow: auto;
 		.infoBodyItem{
 			width: 50%;
 			padding-left: 10px;

components/Station/Station.vue

@@ -3,6 +3,7 @@
 	<view class="stationBody" :class="{status1:itemInfo.status=='E',status2:itemInfo.status=='U',status3:itemInfo.status=='L',status4:itemInfo.status==4}"> 
 	 <view class="item">{{itemInfo.ckName}}</view>
 	 <view class="item">{{itemInfo.name}}</view>
+	 <view class="item">{{itemInfo.ppdName}}</view>
 	 <view class="item">{{itemInfo.status|getstatus}}</view>
 	</view>
 	<view class="stationSelect">

pages.json

@@ -127,6 +127,17 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		/* 清空库位 */
+		
+		{
+		    "path" : "pages/dl_kw_adjust/index",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 		/* 修改密码界面 */
 		{

pages/dl_cmaterial/index.vue

@@ -56,7 +56,9 @@
 		lockMaterials,
 		unlockMaterials,
 		backWarehouse,
-		deactivate
+		deactivate,
+		apiSearchTpByGwid,
+		apiEmptyTpByGwid
 	} from '@/api/dlapi.js';
 	import eventBus from '@/common/util/eventBus.js'
 	import Station from '@/components/Station/Station.vue'
@@ -334,14 +336,24 @@
 				});
 			},
 			adjustbt() {
-				this.$Router.push({
-					path: '/pages/dl_tray_adjust/index',
-					query: {
-						code: this.gwinfor[this.gwSelcetdIndex].id
-					},
+				let that=this
+				apiSearchTpByGwid({gwid:this.gwinfor[this.gwSelcetdIndex].id}).then(e=>{
+					if(e){
+						if(e.records&&e.records.code){
+							that.$Router.push({
+								path: '/pages/dl_tray_adjust/index',
+								query: {
+									tpcode: e.records.code
+								},
+							})
+						}
+					}
 				})
+				
+				
 			},
 			clearbt() {
+				let that=this
 				uni.showModal({
 					title: '提示',
 					content: '是否清空托盘',
@@ -349,7 +361,11 @@
 					confirmText: "是", // 确认按钮的文字  
 					success: function(res) {
 						if (res.confirm) {
-							console.log('用户点击确定');
+							apiEmptyTpByGwid({gwid:that.gwinfor[that.gwSelcetdIndex].id}).then(res=>{
+								if(res){
+									that.$tip("操作成功")
+								}
+							})
 						} else if (res.cancel) {
 							console.log('用户点击取消');
 						}

pages/dl_kw_adjust/index.vue

+<template>
+	<view class="bg-white">
+		<cu-custom bgColor="bg-gradual-blue" :isBack="true">
+			<block slot="content">清空库位</block>
+			<block slot="backText">返回</block>
+		</cu-custom>
+
+
+		<view class="cu-form-group">
+			<view class="title ">地码</view>
+			<input v-model="dmcode" placeholder="请扫描地码" focus="true" @confirm="apiGetDminfo()"></input>
+			<Scan :app="app"  :params="'dmcode'" :do="'apiGetDminfo'" ></Scan>
+		</view>
+		<view class="cu-form-group disable">
+			<view class="title ">已扫地码</view>
+			<input v-model="ysdmcode" disabled="" focus="true"></input>
+		</view>
+		<view v-if="dminfo.id">
+			<view class="flex  flex-wrap padding  bg-grey white radio" style="position: relative;">
+				<view class="basis-sm  margin-top-xs margin-bottom-xs radius">地码编号<span>{{dminfo.mapdatacode}}</span></view>
+				<view class="basis-lg  margin-top-xs margin-bottom-xs radius">名称:<span>{{dminfo.name}}</span></view>
+			</view>
+		</view>
+		<view class="padding flex align-center bg-white justify-around">
+			<button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">调整</button>
+
+		</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import api from '@/api/api.js';
+	import {
+		apiSearchGwByCode,
+		adjustTry,
+		apiEmptyGw
+	} from '@/api/dlapi.js'
+	export default {
+		data() {
+			return {
+				app:this,
+				selected: "",
+				ysdmcode: "",
+				modalName: "",
+				dmcode: "",
+				dminfo:{},
+			}
+		},
+		methods: {
+			// api保存调整
+			apiadjustTry(){
+				let data={
+					"id": this.dminfo.id
+				}
+				apiEmptyGw(data).then(e=>{
+					if(e){
+						this.$tip.alert("清空成功");
+						this.dmcode = ""
+						this.ysdmcode = ""
+						this.dminfo = {}
+					}
+					
+				})
+			},
+			isbctz() {
+				let that=this
+				if (this.ysdmcode) {
+					uni.showModal({
+					    title: '提示',
+					    content: '是否保存并调整',
+						cancelText: "否", // 取消按钮的文字  
+						confirmText: "是", // 确认按钮的文字  
+					    success: function (res) {
+					        if (res.confirm) {
+					           that.apiadjustTry()
+					        } else if (res.cancel) {
+					        
+					        }
+					    }
+					});
+				} else {
+					this.$tip.alert("请先扫描有效托盘信息");
+				}
+
+			},
+			hideModal() {
+				this.modalName = ""
+			},
+			// 弹框
+			confirm(e) {
+				this.modalName = "DialogModal" + e
+			},
+			// 删除确认
+			deldata(item, index) {
+				let that=this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否删除该条信息',
+					cancelText: "否", // 取消按钮的文字  
+					confirmText: "是", // 确认按钮的文字  
+				    success: function (res) {
+				        if (res.confirm) {
+				           that.dminfo.splice(that.selected, 1)
+				        } else if (res.cancel) {
+				        
+				        }
+				    }
+				});
+			},
+			// 获取地码信息
+			apiGetDminfo() {
+				let data={
+					"code": this.dmcode
+				}
+				apiSearchGwByCode(data).then(data => {
+					if (data && data.records) {
+						this.ysdmcode = data.records.mapdatacode
+						this.dminfo = data.records
+					} else {
+						this.dmcode = ""
+						this.ysdmcode = ""
+					}
+				})
+			}
+
+		},
+		onLoad(e) {
+				// if(e.query){
+				// 	console.log(e.query)
+				// 	let dmcode=JSON.parse(e.query).dmcode
+				// 	this.dmcode=dmcode
+					
+				// 	this.apiGetDminfo()
+				// }else{
+				// 	console.log("no message")
+				// }
+		}
+	}
+</script>
+
+<style scoped>
+	/deep/.uni-numbox-btns {
+		width: 27.69px !important;
+	}
+
+	.disable {
+		background-color: #F5F5F5
+	}
+
+	.wid50 {
+		width: 50%;
+	}
+</style>

pages/dl_tray_adjust/index.vue

@@ -139,8 +139,10 @@
 		},
 		onLoad(e) {
 				if(e.query){
+					console.log(e.query)
 					let tpcode=JSON.parse(e.query).tpcode
 					this.tpcode=tpcode
+					
 					this.apiGetTryinfo()
 				}else{
 					console.log("no message")

pages/index/index.vue

@@ -62,7 +62,7 @@
 				</view>
 			</view>
 			<!-- 移入移出 -->
-			<view class="padding-sm" v-if="yrycList.length!=0">
+			<view class="padding-sm" v-if="newyrycList.length!=0">
 				<view class="cu-bar bg-white solid-bottom" >
 					<view class="action text-bold">
 						<text class='cuIcon-title text-blue'></text>移库管理
@@ -132,6 +132,12 @@
 					  icon:"/static/icon/wl2.png",
 					  useCount:1000,
 						page:"cmaterial"
+					},
+					{
+					  title:"清空库位",
+					  icon:"/static/icon/adjust.png",
+					  useCount:1000,
+						page:"kwAdjust"
 					}
 				],
 				newgwjlList:[],
@@ -159,6 +165,7 @@
 						page:"outIn"
 					},
 				],
+				newyrycList:[],
 				// icon:"/wcs/apps/static/icon/work.png",pc端图标路径
 				//手机端去除/wcs/xgapps
 				websock:'',
@@ -179,6 +186,8 @@
 						this.filterMenu(menu,'ckglList','newckglList')
 						this.filterMenu(menu,'gwjlList','newgwjlList')
 						this.filterMenu(menu,'tpglList','newtpglList')
+						this.filterMenu(menu,'yrycList','newyrycList')
+						
 					}
 				})
 			},