From 23b28f832177f052f31b870335ab38dcd8983e98 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Mon, 22 Apr 2024 08:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=9F=A5=E8=AF=A2=E6=9C=AA?=
 =?UTF-8?q?=E6=94=B9=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.api.js        |  8 +++---
 pages.json                |  7 ++++++
 pages/index/index.vue     |  9 +++++++
 pages/inventory/index.vue | 53 +++++++++++++++++++++------------------
 pages/payInto/index.vue   | 14 +----------
 pages/user/user.vue       |  4 +--
 6 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/common/http.api.js b/common/http.api.js
index 97bbfc6..29d75ac 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -23,32 +23,30 @@ const install = (Vue, vm) => {
     //货位调整确认
     pdaAdjustConfirm: (params = {}) => vm.$u.post('/wms/stock/adjust/pdaAdjustConfirm', params),
 
+
+	//容器查询
+	getContainerList: (params = {}) =>vm.$u.get('/wms/container/queryBaseContainerList', params),
     //收货管理
     recevie: {
       //分页查询带订单明细汇总
       pageOrder: (params = {}) => vm.$u.get('/wms/receiving/pda/pageOrder', params),
-
       //获取汇总以及详情信息
       getOrder: (params = {}) => vm.$u.get('/wms/receiving/pda/getOrder', params),
-
       //查询商品对应的包装信息
       queryBasPackageByGoodId: (params = {}) => vm.$u.get('/wms/receiving/pda/queryBasPackageByGoodId',
         params),
-
       //确认收货22
       confirmReceiving: (params = {}) => vm.$u.post('/wms/receiving/pda/confirmReceiving', params), 
 	  //确认收货(多选)
       multipleConfirmReceiving: (params = {}) => vm.$u.post('/wms/receiving/pda/multipleConfirmReceiving', params),
 	  //确认收货(多选)改
 	  multipleConfirmReceivingList: (params = {}) => vm.$u.post('/wms/receiving/pda/multipleConfirmReceivingList', params),
-	  
     },
 	//出库拣货
 	pickBy:{
 	//根据托盘编号获取需要拣货的明细
 	pickByContainerCode: (params = {}) => vm.$u.post('/wms/pick/pda/pickByContainerCode',
 	  params),
-
 	// 出库拣货拣货页面 -- 完成出库
 	pickAGV: (params = {}) => vm.$u.post('/wms/pick/pda/v2/pickAGV',
 	  params),
diff --git a/pages.json b/pages.json
index 771a3a0..ff11594 100644
--- a/pages.json
+++ b/pages.json
@@ -340,6 +340,13 @@
 				"navigationBarTitleText": "点位释放",
 				"navigationBarBackgroundColor": "rgb(18, 150, 219,0.8)"
 			}
+		},
+		{
+			"path": "pages/queryContainer/index",
+			"style": {
+				"navigationBarTitleText": "容器查询",
+				"navigationBarBackgroundColor": "rgb(18, 150, 219,0.8)"
+			}
 		}
 
 	],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index aa2d770..955efc8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -38,6 +38,10 @@
 			<u-grid-item @click="PagerJump(10016)">
 						<image class="in-img" src="../../static/icon/shifang.png" alt="">
 							<view class="wk-text">点位释放</view>
+			</u-grid-item>	
+			<u-grid-item @click="PagerJump(10017)">
+						<image class="in-img" src="../../static/icon/shifang.png" alt="">
+							<view class="wk-text">查询容器</view>
 			</u-grid-item>
 			<!-- 	<u-grid-item @click="PagerJump(10076)">
 						<image class="in-img" src="../../static/icon/icon_94vo0bbzuhq/ruku.png" alt="">
@@ -285,6 +289,11 @@
 						url: 'pages/release/index',
 						type: 'navigateTo',
 					})
+				}else if(this.PagerJumpType === 10017){//点位释放
+					this.$u.route({
+						url: 'pages/queryContainer/index',
+						type: 'navigateTo',
+					})
 				}
 			},
 		}
diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue
index e18c3d0..caa49e1 100644
--- a/pages/inventory/index.vue
+++ b/pages/inventory/index.vue
@@ -253,9 +253,12 @@
 							if(!res.rows || res.rows.length == 0){
 							this.$u.toast("当前托盘内商品不存在");		
 							}else if(res.code == '200'){
-									// res.rows.forEach(item=>{
-									// 	 item.invQty=item.quantity
-									// })
+									res.rows.forEach(item=>{
+										if(item.invWay == 'close'){
+									       item.quantity=0
+										}
+
+									})
 									this.dataList=res.rows
 									setTimeout(()=>{
 										this.dataForm.containerCode=''
@@ -305,27 +308,29 @@
 				 }	
 					 setTimeout(()=>{
 						this.$u.api.invPlan.pdaInvByContainerCode({containerCode:this.form.containerCode}).then(res=>{
-									if(!res.rows || res.rows.length == 0){
-									this.$u.toast("当前托盘内商品不存在");
-									this.dataList=[]
-									}else if(res.code == '200'){
-										if(res.msg){
-											this.$u.toast(res.msg);	
-										}						
-										res.rows.forEach(item=>{
-											if(item.invQty && item.invQty!=0 && ){
-												 item.invQty=item.quantity
-											}
-											
-										})
-											this.dataList=res.rows
-											setTimeout(()=>{
-												this.dataForm.containerCode=''
-											},0)
-											this.$nextTick(()=>{
-												this.firstFocus = true
-											})
-										}
+						if(!res.rows || res.rows.length == 0){
+						this.$u.toast("当前托盘内商品不存在");
+						this.dataList=[]
+						}else if(res.code == '200'){
+							if(res.msg){
+								this.$u.toast(res.msg);	
+							}						
+							res.rows.forEach(item=>{
+								if(item.invQty && item.invQty!=0  ){
+									 item.invQty=item.quantity
+								}
+								if(item.invWay == 'close'){
+								   item.quantity=0
+								}
+							})
+								this.dataList=res.rows
+								setTimeout(()=>{
+									this.dataForm.containerCode=''
+								},0)
+								this.$nextTick(()=>{
+									this.firstFocus = true
+								})
+							}
 						})
 						this.form={}
 						this.show=false
diff --git a/pages/payInto/index.vue b/pages/payInto/index.vue
index 7db39ae..962f7fd 100644
--- a/pages/payInto/index.vue
+++ b/pages/payInto/index.vue
@@ -11,21 +11,17 @@
 						type="text" placeholder="请扫描台车编号" :border="true" />
 				</view>
 				<view style="display: flex;line-height: 65rpx;">
-
 					<text style="font-size: 34rpx;margin-top: 3px;width:78px;">选择物料:</text>
 					<select-lay :options="datalist1" style="width: 78%;padding-left: 0.5vh; " smoldName="ptName"
 						slabel="ptDesc" smodel="ptName" name="name3" svalue="id" @selectitem="queryList"
 						:value="dataForm.ptName" placeholder="请选择物料编码"> </select-lay>
 				</view>
 
-
-
 				<view style="display: flex;line-height: 5vh; margin-top: 2.5vh;">
 					<text style="font-size: 34rpx;">入库数量:</text><input
 						style="width: 72%; text-align: left;padding-left: 15rpx;" v-model="dataForm.rerpQty"
 						class="barNo" type="text" placeholder="请输入入库数量" :border="true" />
 				</view>
-
 				<u-button @click="handleAdd()" class="golists"><text>加入列表</text> </u-button>
 			</u-form>
 			<!-- @input="inputQuery()" -->
@@ -247,7 +243,6 @@
 		methods: {
 			//下拉框
 			queryList(index, item) {
-				// console.log(item.ptPart);
 				this.dataForm.ptPart = item.ptPart
 				this.dataForm.ptName = item.ptName
 				this.dataForm.ptDesc = item.ptDesc
@@ -365,20 +360,17 @@
 					}, 500)
 
 				}, 400)
-				// console.log(this.$refs);
-				// this.$refs.input=''
+
 
 			},
 
 			//延时关闭
 			confirm() {
-				// this.pickUpObj.containerCode=this.containerCode
 				console.log(JSON.stringify(this.dataList));
 				setTimeout(() => {
 
 					this.$u.api.saveInPlanAndItemIn(this.dataList).then(res => {
 						if (res.code == '200') {
-							// this.$u.toast("入库完成");	
 							this.$u.toast("入库已完成，请重新扫描");
 							this.dataForm = {},
 								this.dataList = [],
@@ -388,10 +380,6 @@
 								}, 500)
 						}
 					})
-					// setTimeout(()=>{
-					// 	this.$router.go(0)
-					// },800)
-
 					// 3秒后自动关闭
 					this.show = false;
 
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 02261c9..e4f8019 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -14,10 +14,10 @@
 			</view>
 			<u-row>
 				<u-col>
-					<view class="us-item">
+		<!-- 			<view class="us-item">
 						<text>系统设置</text>
 						<u-icon name="arrow-right" color="#CCCCCC" size="35rpx"></u-icon>
-					</view>
+					</view> -->
 					<view class="us-item">
 						<text>版本信息</text>
 						<text>{{vuex_code}}</text>