From 69a02eb8545c00f932b8e8ae5b5d7d1d113dfe03 Mon Sep 17 00:00:00 2001
From: "juncheng.li" <juncheng.li@ccwin-in.com>
Date: Fri, 28 Apr 2023 13:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E5=82=A8=E4=BD=8D=E8=B0=83=E6=8B=A8=20?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=20=E5=8F=91=E6=96=99=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/index/index.vue                 | 24 ++++++
 fe/PDA/pages/task/issue_detail.vue           | 83 +++++++++++---------
 fe/PDA/static/icons_ui/icon_main_receipt.svg |  6 ++
 fe/PDA/static/icons_ui/icon_main_trans.svg   |  8 ++
 4 files changed, 84 insertions(+), 37 deletions(-)
 create mode 100644 fe/PDA/static/icons_ui/icon_main_receipt.svg
 create mode 100644 fe/PDA/static/icons_ui/icon_main_trans.svg

diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue
index 51a8cadf1..6c799c7cd 100644
--- a/fe/PDA/pages/index/index.vue
+++ b/fe/PDA/pages/index/index.vue
@@ -14,12 +14,25 @@
 			<view class="common_info">
 				<view class="common_title">常用菜单</view>
 				<view class="uni-flex uni-row">
+					<view class="common_cell" @click="taskReceiptClick">
+						<view class="cell_icon">
+							<image src="../../static/icons_ui/icon_main_receipt.svg"></image>
+						</view>
+						<text class="font_xs">采购收货</text>
+					</view>
 					<view class="common_cell" @click="purchasePutawayClick">
 						<view class="cell_icon">
 							<image src="../../static/icons_ui/icons_common_sjadd.svg"></image>
 						</view>
 						<text class="font_xs">采购上架</text>
 					</view>
+					
+					<view class="common_cell" @click="transferDiffLocationClick">
+						<view class="cell_icon">
+							<image src="../../static/icons_ui/icon_main_trans.svg"></image>
+						</view>
+						<text class="font_xs">储位调拨</text>
+					</view>
 					<!-- <view class="common_cell" @click="test">
 					
 						<view class="cell_icon">
@@ -287,12 +300,23 @@
 				localStorage.setItem('selectMenuIndex', index); //选择的菜单
 				this.selectedMenus = item.list;
 			},
+			
+			taskReceiptClick(){
+				uni.navigateTo({
+					url: '/pages/task/receipt'
+				});
+			},
 			// 常用菜单,采购上架
 			purchasePutawayClick() {
 				uni.navigateTo({
 					url: '/pages/putaway/purchasePutaway'
 				});
 			},
+			transferDiffLocationClick() {
+				uni.navigateTo({
+					url: '/pages/inventory/transferDiffLocation'
+				});
+			},
 
 			timerRefresh() {
 				let that = this;
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index c36f0376a..cca89d23d 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -253,6 +253,7 @@
 							// }
 							this.allCount = that.details.length;
 							this.scanCount = 0;
+							
 						}
 						uni.hideLoading();
 					})
@@ -306,53 +307,61 @@
 
 			dyIssue(result, scaned) {
 				let that = this;
+				
 				that.currentItem = that.details.find(r => {
 					return r.itemCode === result.data.itemCode &&
 						r.recommendPackingCode === result.data.code &&
 						r.recommendLot === result.data.lot &&
 						r.scaned === scaned
 				});
-
+				
+				
+				//没找到符合的箱码
 				if (that.currentItem === undefined) {
-					that.currentItem = that.details.find(r => {
-						return r.itemCode === result.data.itemCode &&
-							r.recommendLot === result.data.lot &&
-							r.scaned === scaned
-					});
-
-					if (that.currentItem === undefined) {
-						showConfirmMsg('按零件号【' + result.data.itemCode + '】和批次【' + result.data.lot +
-							'】,在任务中未找到零件,是否按照零件号继续查找?',
-							confirm => {
-								if (confirm) {
-									let items = that.details.filter(r => {
-										return r.itemCode === result.data.itemCode && r.scaned == scaned
-									});
-									if (items.length === 0) {
-										that.showScanMessage('按零件号【' + result.data.itemCode + '】,在任务中未匹配到零件,请扫描其他标签');
-									} else {
-										that.currentItem = items[0]; //匹配到的零件信息
+				var itemCode = that.details.find(res=>{
+						return res.itemCode ===result.data.itemCode&&
+						res.scaned === scaned
+					})
+					//零件号相等
+					if(itemCode!=undefined){
+						var lot = that.details.find(res=>{
+								return res.recommendLot ===result.data.lot&&
+								res.scaned === scaned
+							})
+							
+						if(lot!=undefined){
+							//通过
+							that.currentItem =lot;
+							that.afterScanPackLabel(result);
+						}else {
+							//批次不相等
+							// 提示未执行先进先出或者不是最先批次。
+							setTimeout(res=>{
+								showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => {
+									if (confirm) {
+										that.currentItem = itemCode;
 										that.afterScanPackLabel(result);
+									}else {
+										that.scanPopupGetFocus();
 									}
-								}
-								else
-								{
-									that.scanPopupGetFocus();
-								}
+								});
+							},100)
+							
+						}
+					}else{
+						//零件号不相等
+						var lot = that.details.find(res=>{
+								return res.recommendLot ===result.data.lot&&
+								res.scaned === scaned
 							})
-					} else {
-						showConfirmMsg('按零件号【' + result.data.itemCode + '】和批次【' + result.data.lot + '】,匹配到任务中的【' + that
-							.currentItem
-							.recommendPackingCode + '】箱,是否确认匹配?',
-							confirm => {
-								if (confirm) {
-									that.afterScanPackLabel(result);
-								}
-								else
-								{
-									that.scanPopupGetFocus();
-								}
-							});
+							//批次相等
+						if(lot!=undefined){
+							// 在该任务中未找到零件。
+							that.showScanMessage('在该任务中未找到零件');
+						}else {
+							//零件号不相等,批次不相等
+							that.showScanMessage('所扫描的物料不在任务中');
+						}
 					}
 				} else {
 					that.afterScanPackLabel(result);
diff --git a/fe/PDA/static/icons_ui/icon_main_receipt.svg b/fe/PDA/static/icons_ui/icon_main_receipt.svg
new file mode 100644
index 000000000..5e5628605
--- /dev/null
+++ b/fe/PDA/static/icons_ui/icon_main_receipt.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="54" viewBox="0 0 60 54" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.9" d="M46.8527 14.1205C48.3256 13.3869 48.3318 11.2877 46.8632 10.5454L26.9025 0.456187C26.335 0.169354 25.665 0.169451 25.0976 0.456449L5.24881 10.4963C3.78213 11.2382 3.78679 13.3343 5.25676 14.0697L25.1679 24.0301C25.7301 24.3113 26.3917 24.3119 26.9544 24.0317L46.8527 14.1205ZM27.7009 48.7471C27.7009 50.2379 29.2733 51.2046 30.6037 50.5317L50.9027 40.2641C51.5757 39.9237 52 39.2336 52 38.4794V18.4139C52 16.9276 50.4363 15.9606 49.1065 16.6246L28.8075 26.7606C28.1294 27.0992 27.7009 27.792 27.7009 28.5499V48.7471ZM2.89347 16.5721C1.56374 15.9081 0 16.8751 0 18.3614V38.4794C0 39.2336 0.424272 39.9237 1.09728 40.2641L21.3963 50.5317C22.7267 51.2046 24.2991 50.2379 24.2991 48.7471V28.4974C24.2991 27.7395 23.8706 27.0467 23.1925 26.7081L2.89347 16.5721ZM17.2523 32.8283L5.71028 27.103C5.52804 26.998 5.34579 26.7879 5.34579 26.5778V23.2687C5.34579 22.796 5.89252 22.5333 6.3785 22.7434L17.9206 28.4687C18.1028 28.5737 18.285 28.7838 18.285 28.9939V32.303C18.285 32.7758 17.7383 33.0384 17.2523 32.8283Z" fill="#5A7CF3"/>
+<path d="M37 42.5C37 45.55 38.2116 48.4751 40.3683 50.6317C42.5249 52.7884 45.45 54 48.5 54C51.55 54 54.4751 52.7884 56.6317 50.6317C58.7884 48.4751 60 45.55 60 42.5C60 39.45 58.7884 36.5249 56.6317 34.3683C54.4751 32.2116 51.55 31 48.5 31C45.45 31 42.5249 32.2116 40.3683 34.3683C38.2116 36.5249 37 39.45 37 42.5Z" fill="#5FCB94"/>
+<path d="M45.8462 41H54.1538C55.1692 41 56 41.9 56 43C56 44.1 55.1692 45 54.1538 45H45.8462C44.8308 45 44 44.1 44 43C44 41.9 44.8308 41 45.8462 41Z" fill="#F5F5F5"/>
+<path d="M46.1333 38C46.6 38 47.0667 38.1818 47.44 38.5455C48.1867 39.2727 48.1867 40.3636 47.44 41.0909L45.48 43L47.44 44.9091C48.1867 45.6364 48.1867 46.7273 47.44 47.4545C46.6933 48.1818 45.5733 48.1818 44.8267 47.4545L41.56 44.2727C41.1867 43.9091 41 43.4545 41 43C41 42.5455 41.1867 42.0909 41.56 41.7273L44.8267 38.5455C45.1067 38.1818 45.6667 38 46.1333 38Z" fill="#F5F5F5"/>
+</svg>
diff --git a/fe/PDA/static/icons_ui/icon_main_trans.svg b/fe/PDA/static/icons_ui/icon_main_trans.svg
new file mode 100644
index 000000000..9d37e81e6
--- /dev/null
+++ b/fe/PDA/static/icons_ui/icon_main_trans.svg
@@ -0,0 +1,8 @@
+<svg width="57" height="55" viewBox="0 0 57 55" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.8683 14.2031H45.9351C47.8032 14.2031 49.2319 15.6317 49.2319 17.4999V47.171C49.2319 49.0391 47.8032 50.4677 45.9351 50.4677H11.8683C10.0001 50.4677 8.57153 49.0391 8.57153 47.171V17.4999C8.57153 15.6317 10.0001 14.2031 11.8683 14.2031Z" fill="#6988F4"/>
+<path d="M0.549465 17.94L26.7039 0.576937C27.8029 -0.192312 29.2315 -0.192312 30.3304 0.576937L56.4849 17.94C57.0343 18.2697 57.1442 18.929 56.8146 19.4785C56.5948 19.8082 56.2651 19.9181 55.9354 19.9181H1.09893C0.439571 19.9181 0 19.4785 0 18.8191C0 18.4895 0.219786 18.1598 0.549465 17.94Z" fill="#6988F4"/>
+<path d="M19.5609 19.6992H23.9566C25.8248 19.6992 27.2534 21.1278 27.2534 22.996V27.3917C27.2534 29.2599 25.8248 30.6885 23.9566 30.6885H19.5609C17.6928 30.6885 16.2642 29.2599 16.2642 27.3917V22.996C16.2642 21.1278 17.6928 19.6992 19.5609 19.6992ZM19.5609 33.9853H23.9566C25.8248 33.9853 27.2534 35.4139 27.2534 37.2821V41.6778C27.2534 43.5459 25.8248 44.9746 23.9566 44.9746H19.5609C17.6928 44.9746 16.2642 43.5459 16.2642 41.6778V37.2821C16.2642 35.4139 17.6928 33.9853 19.5609 33.9853ZM33.847 33.9853H38.2427C40.1109 33.9853 41.5395 35.4139 41.5395 37.2821V41.6778C41.5395 43.5459 40.1109 44.9746 38.2427 44.9746H33.847C31.9788 44.9746 30.5502 43.5459 30.5502 41.6778V37.2821C30.5502 35.4139 31.9788 33.9853 33.847 33.9853Z" fill="#ABBDF9"/>
+<path d="M39.1217 19.3679L42.1987 22.4449C43.5174 23.7637 43.5174 25.8516 42.1987 27.0604L39.1217 30.1374C37.803 31.4561 35.715 31.4561 34.5062 30.1374L31.4292 27.0604C30.1105 25.7417 30.1105 23.6538 31.4292 22.4449L34.5062 19.3679C35.715 18.0492 37.803 18.0492 39.1217 19.3679ZM32.7479 42.7751C32.7479 45.9811 34.0215 49.0558 36.2885 51.3227C38.5555 53.5897 41.6301 54.8633 44.8361 54.8633C48.0421 54.8633 51.1168 53.5897 53.3838 51.3227C55.6508 49.0558 56.9243 45.9811 56.9243 42.7751C56.9243 39.5691 55.6508 36.4944 53.3838 34.2274C51.1168 31.9605 48.0421 30.6869 44.8361 30.6869C41.6301 30.6869 38.5555 31.9605 36.2885 34.2274C34.0215 36.4944 32.7479 39.5691 32.7479 42.7751Z" fill="#5FCB94"/>
+<path d="M48.133 44.9746H38.2426C37.0338 44.9746 36.0448 43.9856 36.0448 42.7768C36.0448 41.5679 37.0338 40.5789 38.2426 40.5789H48.133C49.3418 40.5789 50.3308 41.5679 50.3308 42.7768C50.3308 43.9856 49.3418 44.9746 48.133 44.9746Z" fill="#EEF2FE"/>
+<path d="M48.6825 36.7321C49.2319 36.7321 49.7814 36.9519 50.221 37.3915L54.0672 41.2377C54.9463 42.1169 54.9463 43.4356 54.0672 44.3147L50.221 48.161C49.3418 49.0401 48.0231 49.0401 47.144 48.161C46.2648 47.2818 46.2648 45.9631 47.144 45.084L49.4517 42.7762L47.144 40.4685C46.2648 39.5893 46.2648 38.2706 47.144 37.3915C47.4736 36.9519 48.133 36.7321 48.6825 36.7321Z" fill="#EEF2FE"/>
+</svg>