From b3d81b8c997171d6b75f0052edc9e2ba590e616a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 30 Sep 2024 14:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=96=99=E5=8E=BB=E9=99=A4=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E8=A7=84=E6=A0=BC=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemFilter.vue          | 13 ++++++--
 src/pages/query/item.vue                      | 31 +++++++++++++++----
 .../repleinsh/coms/comScanReplishPack.vue     | 21 +++++++------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/mycomponents/item/itemFilter.vue b/src/mycomponents/item/itemFilter.vue
index 16200aee..17a5275c 100644
--- a/src/mycomponents/item/itemFilter.vue
+++ b/src/mycomponents/item/itemFilter.vue
@@ -17,6 +17,12 @@
 				库存状态 :
 				<uni-data-checkbox mode="tag" multiple v-model="state" :localdata="stateList"></uni-data-checkbox>
 			</view>
+			<view v-if="isShowLocationArea"  class="uni-flex " style=" flex-direction: column; width: 100%;margin-top: 10rpx;">
+				<view class="" style="font-size: 35rpx; margin-bottom: 10rpx;">
+					库区
+				</view>
+				<uni-easyinput v-model="locationAreaCode" placeholder="请输入库区"></uni-easyinput>
+			</view>
 			<view class="" style="margin-top: 30rpx; margin-left: 30rpx; margin-right: 30rpx;">
 				<button type="primary" size="default" @click="confirm">确认</button>
 			</view>
@@ -72,7 +78,7 @@
 				type: Boolean,
 				default: false
 			},
-			isShowProductionLineCode: {
+			isShowLocationArea: {
 				type: Boolean,
 				default: false
 			},
@@ -88,7 +94,8 @@
 				checkedWaitModel: false,
 				stateList: [],
 				state:[],
-				locationCode:""
+				locationCode:"",
+				locationAreaCode:""
 			}
 		},
 		watch: {
@@ -130,7 +137,7 @@
 			},
 
 			confirm() {
-				this.$emit("onConfirmClick", this.locationCode,this.state)
+				this.$emit("onConfirmClick", this.locationCode,this.state,this.locationAreaCode)
 				this.closeScanPopup();
 			},
 			
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index 8be5faee..72df1c70 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -1,7 +1,9 @@
 <!-- 基于z-paging封装个性化分页组件演示(vue) -->
 <template>
 	<view class="uni-flex" style="flex-direction: column">
-		<itemFilter ref="filter" @onConfirmClick="confirm">
+		<itemFilter ref="filter" 
+		:isShowLocationArea="true"
+		 @onConfirmClick="confirm">
 		</itemFilter>
 		<view ref="topContent" class="top" >
 			<com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view>
@@ -88,7 +90,8 @@
 				locationCode: "",
 				inventoryStatus: "",
 				pageSize:10,
-				topHeight:115
+				topHeight:115,
+				locationAreaCode:""
 			}
 		},
 		//返回首页
@@ -190,6 +193,14 @@
 						value: this.locationCode
 					})
 				}
+				
+				if (this.locationAreaCode) {
+					filters.push({
+						column: "areaCode",
+						action: "==",
+						value: this.locationAreaCode
+					})
+				}
 
 				if (this.inventoryStatus) {
 					filters.push({
@@ -256,6 +267,14 @@
 						value: this.locationCode
 					})
 				}
+				
+				if (this.locationAreaCode) {
+					filters.push({
+						column: "areaCode",
+						action: "==",
+						value: this.locationAreaCode
+					})
+				}
 
 				if (this.inventoryStatus) {
 					filters.push({
@@ -320,7 +339,6 @@
 					mask: true
 				});
 
-
 				this.loadingType = "loading";
 				if (type === "refresh") {
 					this.pageNo = 1;
@@ -340,7 +358,7 @@
 						value: this.locationCode
 					})
 				}
-
+				
 				if (this.inventoryStatus) {
 					filters.push({
 						column: "inventoryStatus",
@@ -409,7 +427,7 @@
 						value: this.locationCode
 					})
 				}
-
+				
 				if (this.inventoryStatus) {
 					filters.push({
 						column: "inventoryStatus",
@@ -469,9 +487,10 @@
 				this.getContentByTab(index, this.pageNo, this.pageSize, "refresh")
 			},
 
-			confirm(locationCode, status) {
+			confirm(locationCode, status,locationAreaCode) {
 				if(this.itemCode){
 					this.locationCode = locationCode;
+					this.locationAreaCode=locationAreaCode;
 					if(status.length>0){
 						var arrayItems = status.join(',')
 						this.inventoryStatus = arrayItems
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 8a983675..71cec1f1 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -255,16 +255,17 @@
 							});
 						return
 					}
-					if (result.package.packUnit !== item.packUnit) {
-						this.$refs.comMessage.showQuestionMessage(
-							`扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => {
-								if (res) {
-									this.getToLocationBalance(result)
-								}
-							});
-					} else {
-						this.getToLocationBalance(result)
-					}
+					this.getToLocationBalance(result)
+					// if (result.package.packUnit !== item.packUnit) {
+					// 	this.$refs.comMessage.showQuestionMessage(
+					// 		`扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => {
+					// 			if (res) {
+					// 				this.getToLocationBalance(result)
+					// 			}
+					// 		});
+					// } else {
+					// 	this.getToLocationBalance(result)
+					// }
 				}
 			},