From 7113fa4c29f02801d4c77ec5ee800d4cd202c04f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 10:35:15 +0800
Subject: [PATCH 01/10] =?UTF-8?q?HL-5275=20=E7=9B=B4=E6=8E=A5=E7=A7=BB?=
 =?UTF-8?q?=E5=BA=93=E6=89=AB=E6=8F=8F=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=AE=B1?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=89=AB=E6=8F=8F=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E4=B8=AA=E6=97=B6=E6=B2=A1=E6=9C=89=E5=85=89=E6=A0=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=9C=80=E8=A6=81=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A1=86=E6=89=8D=E8=83=BD=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index e958c8d4..d7504bf6 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -434,7 +434,7 @@
 					balance: item,
 					fromLocationCode: this.fromLocationCode,
 				}
-				// this.packGetFocus();
+				this.packGetFocus();
 				this.$emit("getResult", data);
 			},
 

From 908af9994956ae634c3876fe255837b5f0683e4c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 13:10:08 +0800
Subject: [PATCH 02/10] =?UTF-8?q?HL-5359=20=E5=9C=A8=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9A?=
 =?UTF-8?q?semiProductReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85?=
 =?UTF-8?q?=E9=85=8D=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCom?=
 =?UTF-8?q?mitValidate=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue                     |  2 +-
 .../job/productReceiptDetail.vue              | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 8fb3b6c7..1fa86ce7 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -388,7 +388,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 7a898713..1c6c3cb3 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -85,7 +85,8 @@
 	import {
 		goHome,
 		navigateBack,
-		getPackingNumberAndBatch,
+		getPackingNumberAndBatch,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 
 	import {
@@ -334,18 +335,21 @@
 				});
 			},
 
-			commit() {
+			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
+				}
+				var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate")
+				//校验库位、
+				if(valiDate){
+					if (!this.checkLocation()) {
+						return
+					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-
-
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					if (this.checkCount()) {

From 110767de2ade859596c77b47a4d5a0490d84f7ce Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 14:50:22 +0800
Subject: [PATCH 03/10] =?UTF-8?q?HL-4766=20=E5=9C=A8WMS=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=92=8CPDA=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js       |  2 +-
 src/pages/login/index.vue | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index f654afbd..8dc5ef33 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -19,7 +19,7 @@ export function getCaptchaImage(params) {
  */
 export function login(username, password, code, uuid, tenantName) {
 	return request({
-		url: baseApi + '/system/auth/login',
+		url: baseApi + '/system/auth/loginNoCode',
 		headers: {
 			isToken: false
 		},
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 50420dd7..71ac4b30 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -65,13 +65,13 @@
 						</view>
 
 					</view>
-					<view style="display: flex;flex-direction: row;">
+					<view style="display: flex;flex-direction: row;" v-if="needCode">
 						<!-- <view class="uni-input">
 							<input class="" placeholder="请输入验证码"
 							v-model="code"
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
-						<view class="uni-input-wrapper">
+						<view class="uni-input-wrapper" >
 							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
@@ -119,7 +119,8 @@
 				imageSrc: "",
 				code: "",
 				uuid: "",
-				version: ""
+				version: "",
+				needCode:false
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -185,13 +186,15 @@
 						icon: 'none',
 						mask: true
 					})
-				} else if (this.code === '') {
+				} 
+				else if (this.needCode&&this.code === '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none',
 						mask: true
 					})
-				} else {
+				} 
+				else {
 					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
 					let logininfo = {
 						username: "",

From 61d96a6582861ea729837ece9822a2ea70d64807 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 14:57:22 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E4=B8=8A=E6=9E=B6=E6=89=AB=E6=8F=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/productPutawayRecord.vue           | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 1c98771d..d3362b7d 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="">
+	<view class="page-wraper">
 		<view class="">
 			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-		<view class="uni-flex uni-column" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
-			<view class="" style="flex: 1;">
+		<view class="page-wraper" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
+			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
@@ -30,9 +30,11 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+
 		</view>
 
+		<win-scan-button v-if="detailSource.length>0" @goScan='openScanPopup'></win-scan-button>
+
 		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
 			:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
@@ -142,7 +144,7 @@
 		},
 
 		methods: {
-			 getScanResult(result) {
+			getScanResult(result) {
 				let label = result.label;
 				let pack = result.package;
 				result.balance.forEach(
@@ -155,17 +157,14 @@
 						})
 						if (item == undefined) {
 							var itemp = createItemInfo(balance, pack);
+							itemp.containerNumber = balance.parentPackingNumber
 							//查询推荐的目标库位
-							let newDetail = createDetailInfo(balance, pack); 
+							let newDetail = createDetailInfo(balance, pack);
 							newDetail.fromInventoryStatus = balance.inventoryStatus;
 							itemp.subList.push(newDetail);
-							this.getRecommendLocation(balance, res => {
-								itemp.toLocationCode = res.code;
-								itemp.expectinNumber = res.expectinNumber;
-								this.detailSource.push(itemp)
-								this.$forceUpdate();
-							})
-							
+							this.detailSource.push(itemp)
+							this.calcHandleQty();
+							this.getRecommendLocation(balance)
 						} else {
 							var detail = item.subList.find(r => {
 								if (r.packingNumber == balance.packingNumber &&
@@ -191,7 +190,7 @@
 				)
 			},
 
-			getRecommendLocation(balance, callback) {
+			getRecommendLocation(balance) {
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
@@ -201,11 +200,21 @@
 					expectinNumber: balance.packingNumber + "-" + Date.now(),
 					itemCode: balance.itemCode,
 					inventoryStatus: balance.inventoryStatus,
+					batch: balance.batch
 				};
 				console.log(JSON.stringify(param))
-				getrecommendLocationExpectin(param).then(res => {
-					callback(res.data);
+				getrecommendLocationExpectin(param).then(result => {
 					uni.hideLoading();
+					let item = this.detailSource.find(res => {
+						if (res.itemCode == balance.itemCode && res.containerNumber == balance
+							.parentPackingNumber) {
+							return res
+						}
+					})
+					item.toLocationCode = result.data.code;
+					item.expectinNumber = result.data.expectinNumber;
+					this.$forceUpdate();
+
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error);
@@ -277,7 +286,7 @@
 					this.$refs.scanPopup.getfocus();
 				}
 			},
-			
+
 			scanPopupLoseFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.losefocus();
@@ -460,9 +469,8 @@
 					}
 				}
 			},
-			
-			cancel()
-			{
+
+			cancel() {
 				this.clearData();
 				this.openScanPopup();
 			}

From 1e82452cf91ce137cc7b77909c2c0e77042276f8 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:02:52 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 690ddbff..161473dc 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -392,7 +392,7 @@
 				let hint=""
 				this.dataContent.subList.forEach(res=>{
 					if(res.fromLocationCode==res.toLocationCode&&
-					res.fromInventoryStatus&&res.toInventoryStatus){
+					res.fromInventoryStatus==res.toInventoryStatus){
 						hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
 					}
 				})

From 31710c05bcdd4339008643b040ba0ea2cb35f7d9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:03:10 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  39 ++
 src/pages/putaway/job/quantityPutawayJob.vue  | 431 +++++++++++++
 .../putaway/job/quantityPutawayJobDetail.vue  | 604 ++++++++++++++++++
 3 files changed, 1074 insertions(+)
 create mode 100644 src/pages/putaway/job/quantityPutawayJob.vue
 create mode 100644 src/pages/putaway/job/quantityPutawayJobDetail.vue

diff --git a/src/pages.json b/src/pages.json
index 33a6771c..de431de2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -458,6 +458,45 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		
+		{
+			"path": "pages/putaway/job/quantityPutawayJob",
+			"style": {
+				"navigationBarTitleText": "采购上架(批量)",
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		
+		{
+			"path": "pages/putaway/job/quantityPutawayJobDetail",
+			"style": {
+				"navigationBarTitleText": "采购上架(批量)详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		
+		
 		{
 			"path": "pages/putaway/record/putawayRecord",
 			"style": {
diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
new file mode 100644
index 00000000..9c903838
--- /dev/null
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@@ -0,0 +1,431 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-putaway-job-card :dataContent="item" @click='openJobDetail(item)'></com-putaway-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<putaway-info-popup ref='jobInfoPopup'></putaway-info-popup>
+			<putaway-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></putaway-job-list-popup>
+			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+
+		</view>
+		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
+
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult'>
+		</winScanPackJob>
+		<jobList ref="jobList" @selectItem="selectItem"></jobList>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import jobList from '@/mycomponents/jobList/jobList.vue'
+
+	import {
+		getPutawayJobList,
+		cancleTakePutawayJob
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comPutawayJobCard from '@/pages/putaway/coms/comPutawayJobCard.vue'
+	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
+	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
+	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+	import {
+		Exception
+	} from 'sass';
+
+	export default {
+		name: 'Putaway',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comPutawayJobCard,
+			putawayJobListPopup,
+			putawayInfoPopup,
+			winScanButton,
+			winScanPackJob,
+			jobList
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+				title: '',
+				scanMessage: ""
+			};
+		},
+
+		onLoad(option) {
+			this.title = option.title
+		},
+
+		onShow() {
+			this.getList('refresh');
+
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "create_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+				}
+
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+						this.openScanPopup()
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					updateTitle(this.title + "(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					this.pageNo++;
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					this.loadingType = "";
+					updateTitle(this.title);
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + '&title=' + this.title
+				});
+				this.scanMessage = ""
+			},
+
+			showItemList(itemList) {
+				this.$refs.scanList.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.masterId);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakePutawayJob(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getPutawayJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+
+			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
+					}
+				});
+			},
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+			selectItem(item) {
+				this.$refs.scanPopup.closeScanPopup();
+				uni.navigateTo({
+					url: './putawayDetail?id=' +
+						item.masterId +
+						'&status=' + item.status +
+						'&scaned=' + item.packingNumber +
+						'&title=' + this.title +
+						"&scanMessage=" + this.scanMessage
+				});
+				this.scanMessage = ""
+			},
+			getScanResult(result) {
+				try {
+					this.scanMessage = ""
+					var filters = [{
+							column: "packingNumber",
+							action: "in",
+							value: result.package.number + "," + result.package.parentNumber
+						},
+						{
+							column: "batch",
+							action: "==",
+							value: result.package.batch
+						},
+						// {
+						// 	column: "qty",
+						// 	action: "==",
+						// 	value: result.label.qty
+						// },
+						{
+							column: "itemCode",
+							action: "==",
+							value: result.package.itemCode
+						},
+						{
+							column: "status",
+							action: "in",
+							value: '1,2',
+						},
+						// {
+						// 	column: "accept_user_id",
+						// 	action: "==",
+						// 	value: this.$store.state.user.id
+						// }
+						// {
+						// 	column: "fromLocationCode",
+						// 	action: "==",
+						// 	value: result.label.fromLocationCode
+						// },
+					]
+					getPutawayJobList({
+						filters: filters,
+						pageNo: 1,
+						pageSize: 100,
+					}).then(res => {
+						this.scanMessage = result.scanMessage
+						let resultList = res.data.list;
+						if (resultList.length > 0) {
+							resultList.forEach(item => {
+								item.title = item.number;
+								item.selected = false
+							})
+							let list = []
+							resultList.forEach(item => {
+								if (!list.find(subItem => subItem.title == item.title)) {
+									list.push(item)
+								}
+							})
+							if (list.length == 1) {
+								//待处理
+								if (list[0].status == 1) {
+									this.selectItem(list[0])
+								} else if (list[0].status == 2) {
+									//进行中
+									if (list[0].acceptUserId == this.$store.state.user.id) {
+										this.selectItem(list[0])
+									} else {
+										this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "\n任务号[" +
+											list[0].number + "]扫描[" + result.scanMessage + "]")
+									}
+								} else if (list[0].status == 3) {
+									this.showMessage("该任务已经完成\n承接人[" + list[0].acceptUserName + "]\n任务号[" +
+										list[0].number + "]扫描[" + result.scanMessage + "]")
+								}
+							} else {
+								this.showMessage("查询到多条任务\n" + "扫描[" + result.scanMessage + "]")
+							}
+
+						} else {
+							this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
+						}
+					}).catch(error => {
+						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
+					})
+
+				} catch (e) {
+					this.showMessage(e + "\n扫描[" + result.scanMessage + "]")
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/putaway/job/quantityPutawayJobDetail.vue b/src/pages/putaway/job/quantityPutawayJobDetail.vue
new file mode 100644
index 00000000..80540675
--- /dev/null
+++ b/src/pages/putaway/job/quantityPutawayJobDetail.vue
@@ -0,0 +1,604 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					申请单号 : {{jobContent.requestNumber}}
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+							:isShowStatus="false" @remove="updateData" @updateData="updateData"
+							:locationAreaTypeList='toLocationAreaTypeList'>
+						</comJobDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode' :isShowEdit="isCheckLocation"
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		<!-- 		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		</winScanPackAndLocationNoBalance> -->
+
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
+			:noShowBalanceMessage="true">
+		</winScanPackAndLocation>
+
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getManagementPrecisions,
+	} from '@/common/balance.js';
+
+	import {
+		getPutawayJobDetail,
+		putawayJobSubmit,
+		takePutawayJob,
+		cancleTakePutawayJob,
+		getSwitchByCode
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		navigateBack,
+		compareAsc,
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusName
+	} from '@/common/directory.js';
+
+	import {
+		getTreeDataSource,
+		calcHandleQty,
+		calcTreeHandleQty,
+		getScanCount
+	} from '@/common/detail.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue"
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPackAndLocation,
+			locationCompare,
+			comJobDetailCard,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				managementList: [],
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationAreaTypeList: [],
+				jobStatus: "",
+				jobToLocationCode: "",
+				isCheckLocation: false,
+				scanMessage: ""
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			this.scanMessage = option.scanMessage
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务
+					cancleTakePutawayJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takePutawayJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getPutawayJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.detailSource = getTreeDataSource(that.subList)
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+							that.isCheckLocation = getSwitchInfoByCode("PurchasePutawayToLocationCodeValidate")
+							if (that.isCheckLocation) {
+								that.toLocationCode = ""
+							} else {
+								that.toLocationCode = that.jobToLocationCode;
+							}
+							//外部进入详情，如果有扫描信息，模拟自动扫描
+							if (this.scanMessage) {
+								this.openScanPopupSimulate(this.scanMessage)
+							}
+
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			calcScanCount(closeScan) {
+				let items = this.subList.filter(r => {
+					if (r.scaned) {
+						return r;
+					}
+				})
+				this.scanCount = items != null ? items.length : 0;
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				}
+			},
+
+			calcHandleQty() {
+				calcTreeHandleQty(this.detailSource);
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			updateData() {
+				console.log("updateData")
+				// this.calcHandleQty();
+				calcTreeHandleQty(this.detailSource)
+			},
+			//模拟扫描功能
+			openScanPopupSimulate(message) {
+
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							fromlocationCode = l.fromLocationCode;
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
+					message);
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			getScanResult(result) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var locationCode = result.fromLocationCode;
+
+					if (!result.balance) {
+						this.showMessage("箱码【" + packingNumber + "】没有库存余额")
+						return;
+					}
+
+					// var inventoryStatus = "OK";
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = detail.subList.find(r => {
+							return r.packingNumber == packingNumber &&
+								r.batch == batch &&
+								r.fromLocationCode == result.fromLocationCode
+						})
+
+						if (itemDetail == undefined) {
+							var isExit;
+							for (let subItem of detail.subList) {
+								var item;
+								for (let pack of subItem.packList) {
+									if (pack.packingNumber == packingNumber &&
+										pack.batch == batch) {
+										item = pack;
+										isExit = pack;
+										break;
+									}
+								}
+								if (item != undefined) {
+									subItem.scaned = true
+									subItem.handleQty = 0;
+									item = undefined
+								}
+							}
+							if (isExit == undefined) {
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】不在列表中")
+							} else {
+								if (!isExit.cancleScanedHiht && isExit.scaned) {
+									this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								} else {
+									isExit.scaned = true
+									let qty = 0;
+									if (result.balance != null) {
+										qty = Number(result.balance.qty);
+									} else {
+										qty = Number(result.label.qty);
+									}
+
+									isExit.handleQty = Number(result.label.qty);
+									isExit.toLocationCode = this.toLocationCode;
+								}
+							}
+							calcTreeHandleQty(this.detailSource);
+							this.continueScan()
+							this.$forceUpdate()
+						} else {
+							var scanedLength = 0;
+							itemDetail.packList.forEach(res => {
+								if (res.scaned) {
+									scanedLength++;
+								}
+							})
+
+							//大哥让加的
+							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+
+							if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList
+								.length) {
+								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							} else {
+								itemDetail.scaned = true;
+								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
+								itemDetail.handleQty = result.label.qty;
+								// itemDetail.toInventoryStatus = "OK"
+								itemDetail.packList.forEach(pac => {
+									pac.scaned = true
+									pac.handleQty = Number(pac.qty);
+									pac.toLocationCode = this.toLocationCode;
+								})
+
+								calcTreeHandleQty(this.detailSource);
+								this.continueScan()
+								this.$forceUpdate()
+							}
+						}
+					}
+				} catch (e) {
+					this.showMessage(e.message)
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			checkLocation() {
+				var isPass = true;
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
+					this.showMessageHint('请扫描收货库位', callback => {
+						this.$refs.comScanLocation.showLocation();
+					})
+
+					return isPass = false;
+				}
+				return isPass;
+			},
+
+			showMessageHint(hint, callback) {
+				this.$refs.comMessage.showErrorMessage(hint, res => {
+					if (res) {
+						callback()
+					}
+				});
+			},
+
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				if (!this.checkLocation()) {
+					return
+				}
+
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					this.submitJob();
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+					}
+				}
+			},
+
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+						putawayJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+
+							detail.singlePrice = 1;
+							detail.amount = 11;
+
+							detail.arriveDate = getCurrDateTime();
+							detail.produceDate = getCurrDateTime();
+							detail.expireDate = getCurrDateTime();
+
+
+							let packList = detail.packList.filter(p => p.scaned == true);
+							detail.packList = packList;
+
+
+							// detail.singlePrice = detail.balance.singlePrice;
+							// detail.amount = detail.balance.singlePrice * detail.handleQty;
+
+							// detail.arriveDate = detail.balance.arriveDate;
+							// detail.produceDate = detail.balance.produceDate;
+							// detail.expireDate = detail.balance.expireDate;
+							subList.push(detail)
+						}
+					})
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showErrorMessage(message) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (res) {
+							this.afterCloseMessage()
+						}
+					});
+				})
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file

From a3c4e52f0db74fdb97b1f4b8e6abdf633d8599a6 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:11:33 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E4=B8=8A=E6=9E=B6=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/productPutawayRecord.vue           | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 1c98771d..d3362b7d 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="">
+	<view class="page-wraper">
 		<view class="">
 			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-		<view class="uni-flex uni-column" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
-			<view class="" style="flex: 1;">
+		<view class="page-wraper" v-if="detailSource.length>0" style="height: calc(100vh - 44px);">
+			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
@@ -30,9 +30,11 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+
 		</view>
 
+		<win-scan-button v-if="detailSource.length>0" @goScan='openScanPopup'></win-scan-button>
+
 		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
 			:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
@@ -142,7 +144,7 @@
 		},
 
 		methods: {
-			 getScanResult(result) {
+			getScanResult(result) {
 				let label = result.label;
 				let pack = result.package;
 				result.balance.forEach(
@@ -155,17 +157,14 @@
 						})
 						if (item == undefined) {
 							var itemp = createItemInfo(balance, pack);
+							itemp.containerNumber = balance.parentPackingNumber
 							//查询推荐的目标库位
-							let newDetail = createDetailInfo(balance, pack); 
+							let newDetail = createDetailInfo(balance, pack);
 							newDetail.fromInventoryStatus = balance.inventoryStatus;
 							itemp.subList.push(newDetail);
-							this.getRecommendLocation(balance, res => {
-								itemp.toLocationCode = res.code;
-								itemp.expectinNumber = res.expectinNumber;
-								this.detailSource.push(itemp)
-								this.$forceUpdate();
-							})
-							
+							this.detailSource.push(itemp)
+							this.calcHandleQty();
+							this.getRecommendLocation(balance)
 						} else {
 							var detail = item.subList.find(r => {
 								if (r.packingNumber == balance.packingNumber &&
@@ -191,7 +190,7 @@
 				)
 			},
 
-			getRecommendLocation(balance, callback) {
+			getRecommendLocation(balance) {
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
@@ -201,11 +200,21 @@
 					expectinNumber: balance.packingNumber + "-" + Date.now(),
 					itemCode: balance.itemCode,
 					inventoryStatus: balance.inventoryStatus,
+					batch: balance.batch
 				};
 				console.log(JSON.stringify(param))
-				getrecommendLocationExpectin(param).then(res => {
-					callback(res.data);
+				getrecommendLocationExpectin(param).then(result => {
 					uni.hideLoading();
+					let item = this.detailSource.find(res => {
+						if (res.itemCode == balance.itemCode && res.containerNumber == balance
+							.parentPackingNumber) {
+							return res
+						}
+					})
+					item.toLocationCode = result.data.code;
+					item.expectinNumber = result.data.expectinNumber;
+					this.$forceUpdate();
+
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error);
@@ -277,7 +286,7 @@
 					this.$refs.scanPopup.getfocus();
 				}
 			},
-			
+
 			scanPopupLoseFocus() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.losefocus();
@@ -460,9 +469,8 @@
 					}
 				}
 			},
-			
-			cancel()
-			{
+
+			cancel() {
 				this.clearData();
 				this.openScanPopup();
 			}

From cb15c0cf5d298eae709ce70fb1b526479e837322 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:11:51 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 690ddbff..161473dc 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -392,7 +392,7 @@
 				let hint=""
 				this.dataContent.subList.forEach(res=>{
 					if(res.fromLocationCode==res.toLocationCode&&
-					res.fromInventoryStatus&&res.toInventoryStatus){
+					res.fromInventoryStatus==res.toInventoryStatus){
 						hint +=`包装号【${res.fromPackingNumber}】来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
 					}
 				})

From 42e5dc42eadd1ff038ef4201f6b39bfcaeb1a5c1 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 16 Aug 2024 15:33:09 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 3da3f3cc..5230d74c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,10 +1,10 @@
 {
     "name" : "wms",
     "package" : "uni.UNI43932FE",
-    "appid" : "__UNI__F36DDCF",
+    "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.63",
-    "versionCode" : 63,
+    "versionName" : "1.0.64",
+    "versionCode" : 64,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From 1a1c9874a2ec23af3ee67deb31c6c5f786a5ef73 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 17:00:40 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E7=A4=BA=E5=8F=98=E6=B7=BB=E5=8A=A0=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E5=92=8C=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E9=98=B6=E6=AE=B5=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 200 +++++++++++++---------------
 1 file changed, 89 insertions(+), 111 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index dab39818..baefd393 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -5,10 +5,11 @@
 			<view @click="tabIndex = 1" :class="tabIndex == 1?'active1' :''" style="padding: 10rpx 0px;">检验指引单</view>
 			<view @click="tabIndex = 2" :class="tabIndex == 2?'active1' :''" style="padding: 10rpx 0px;">上架指引单</view>
 		</view>
-		<view class="" :style="{'paddingTop':isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0?'100rpx': '30rpx'}">
+		<view class=""
+			:style="{'paddingTop':isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0?'100rpx': '30rpx'}">
 			<view class="box" style="page-break-before:always;" v-if="tabIndex == 1">
-				<view class="relative"  v-for="(item,index) in showTableInspectDTOList" :key='index'> 
-				<view class="q">Q</view>
+				<view class="relative" v-for="(item,index) in showTableInspectDTOList" :key='index'>
+					<view class="q">Q</view>
 					<table border='1'>
 						<thead>
 							<tr class='top1'>
@@ -35,8 +36,14 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
-							<tr v-if="!item.haveInspectionRequest">
-								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+							<tr v-if="item.haveInspectionRequest==='0'">
+								<td colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+							</tr>
+							<tr v-else-if="item.haveInspectionRequest==='2'">
+								<td colspan='4' style="color:#ffab01;font-weight: bold;font-size: 15px;">没有检验方案</td>
+							</tr>
+							<tr v-else-if="item.haveInspectionRequest==='3'">
+								<td colspan='4' style="color:#258eff;font-weight: bold;font-size: 15px;">检验阶段不存在</td>
 							</tr>
 						</tbody>
 					</table>
@@ -123,7 +130,7 @@
 				currentPage1: 1,
 				pageSize1: 20,
 				number: '',
-				isHaveOn: false,//显示上架指引单
+				isHaveOn: false, //显示上架指引单
 				// isHaveInspect:false,//显示检验指引单
 			}
 		},
@@ -201,83 +208,52 @@
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
-							if(!item.haveInspectionRequest){
-								str += `
-										<div class="box" style="page-break-before:always;"><br />
-											<div class="relative" > 
-												<div class="q">Q</div>
-												<table border='1'>
-													<thead>
-														<tr class='top1'>
-															<th>物料代码:</th>
-															<th colspan='3'>${item.itemCode}</th>
-														</tr>
-													</thead>
-													<tbody>
-														<tr>
-															<td>物料名称</td>
-															<td>${item.itemName}</td>
-															<td>发货单号</td>
-															<td>${this.data1.asnNumber}</td>
-														</tr>
-														<tr>
-															<td>供应商</td>
-															<td>${item.supplierCode}</td>
-															<td>供应商批次</td>
-															<td>${item.supplierBatch}</td>
-														</tr>
-														<tr>
-															<td>到货数量</td>
-															<td>${item.quantityQty}</td>
-															<td>抽检数量</td>
-															<td>${item.sampleQty}</td>
-														</tr>
-														<tr>
-															<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-														</tr>
-													</tbody>
-												</table>
-											</div>
-										</div>
-										`
-							}else{
-								str += `
-										<div class="box" style="page-break-before:always;"><br />
-											<div class="relative" > 
-												<div class="q">Q</div>
-												<table border='1'>
-													<thead>
-														<tr class='top1'>
-															<th>物料代码:</th>
-															<th colspan='3'>${item.itemCode}</th>
-														</tr>
-													</thead>
-													<tbody>
-														<tr>
-															<td>物料名称</td>
-															<td>${item.itemName}</td>
-															<td>发货单号</td>
-															<td>${this.data1.asnNumber}</td>
-														</tr>
-														<tr>
-															<td>供应商</td>
-															<td>${item.supplierCode}</td>
-															<td>供应商批次</td>
-															<td>${item.supplierBatch}</td>
-														</tr>
-														<tr>
-															<td>到货数量</td>
-															<td>${item.quantityQty}</td>
-															<td>抽检数量</td>
-															<td>${item.sampleQty}</td>
-														</tr>
-													</tbody>
-												</table>
-											</div>
-										</div>
-										`
+							let str1 = `
+							<div class="box" style="page-break-before:always;"><br />
+								<div class="relative" > 
+									<div class="q">Q</div>
+									<table border='1'>
+										<thead>
+											<tr class='top1'>
+												<th>物料代码:</th>
+												<th colspan='3'>${item.itemCode}</th>
+											</tr>
+										</thead>
+										<tbody>
+											<tr>
+												<td>物料名称</td>
+												<td>${item.itemName}</td>
+												<td>发货单号</td>
+												<td>${this.data1.asnNumber}</td>
+											</tr>
+											<tr>
+												<td>供应商</td>
+												<td>${item.supplierCode}</td>
+												<td>供应商批次</td>
+												<td>${item.supplierBatch}</td>
+											</tr>
+											<tr>
+												<td>到货数量</td>
+												<td>${item.quantityQty}</td>
+												<td>抽检数量</td>
+												<td>${item.sampleQty}</td>
+											</tr>
+							`
+							let str2 = ``
+							if(item.haveInspectionRequest==='0'){
+								str2 =`<tr><td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td></tr>`
+							}else if(item.haveInspectionRequest==='2'){
+								str2 =`<tr><td colspan='4' style="color:#ffab01;font-weight: bold;font-size: 15px;">没有检验方案</td></tr>`
+							}else if(item.haveInspectionRequest==='3'){
+								str2 =`<tr><td colspan='4' style="color:#258eff;font-weight: bold;font-size: 15px;">检验阶段不存在</td></tr>`
 							}
-							
+							let str3 = `
+										</tbody>
+									</table>
+								</div>
+							</div>
+							`
+							str += str1 + str2+ str3
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
 							"mainBody", str); //替换物品代码
@@ -318,7 +294,7 @@
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
-			
+
 					}
 				});
 			},
@@ -346,7 +322,7 @@
 		},
 		async onShow() {
 			// 获取上架指引单
-			if(this.data.ids){
+			if (this.data.ids) {
 				await getJimuPutawayJobDetail({
 					masterIds: this.data.ids
 				}).then(res => {
@@ -355,27 +331,26 @@
 				})
 			}
 			// 获取采购收货指引单
-			if(this.number){
+			if (this.number) {
 				await queryInspectionFreeFlag({
-					number: this.number
-				}).then(async res1 => {
-					console.log(444,res1)
-					this.data1 = res1.data
-					this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
-					if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
-						this.tabIndex =2
-					}
-					this.getTableInspectDTOList()
-				})
-				.catch(error=>{
-					this.$refs.comMessage.showMessage(error, res => {
-						if (res) {
-					
+						number: this.number
+					}).then(async res1 => {
+						this.data1 = res1.data
+						this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item => item.sampleQty >0)
+						if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) {
+							this.tabIndex = 2
 						}
-					});
-				})
+						this.getTableInspectDTOList()
+					})
+					.catch(error => {
+						this.$refs.comMessage.showMessage(error, res => {
+							if (res) {
+
+							}
+						});
+					})
 			}
-			
+
 			this.getPointPutawayJobHtml()
 			this.getPurchaseReceiptJobHtml()
 		},
@@ -531,11 +506,13 @@
 
 	td {
 		padding: 10px;
-		&:nth-child(2n){
-			width:290rpx;
+
+		&:nth-child(2n) {
+			width: 290rpx;
 		}
-		&:nth-child(2n+1){
-			width:160rpx;
+
+		&:nth-child(2n+1) {
+			width: 160rpx;
 		}
 
 	}
@@ -563,17 +540,18 @@
 			border-bottom: 4rpx solid rgb(60, 156, 255);
 		}
 	}
-	.relative{
+
+	.relative {
 		margin-bottom: 20rpx;
 		position: relative;
 	}
-		
-	.q{
+
+	.q {
 		position: absolute;
 		left: 50%;
-		top:50%;
+		top: 50%;
 		font-size: 400rpx;
-		transform: translate(-50% ,-50%);
+		transform: translate(-50%, -50%);
 		color: rgba(0, 0, 0, 0.1);
 	}
 </style>
\ No newline at end of file