From bee9f314887efe0c7cb259bd545f478a76e36a8c Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 1 Aug 2024 17:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8A=E6=9E=B6=E5=8F=8A=E7=89=A9=E6=96=99=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           | 11 +++
 src/mycomponents/scan/winScanPackage.vue      |  8 +-
 src/pages/fg/fgChange.vue                     | 18 +++--
 .../record/productPutawayRecord.vue           | 74 +++++++++++--------
 .../job/productReceiptDetail.vue              | 12 +--
 .../coms/comProductionRecord.vue              |  2 +-
 6 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 02362e27..dec2045b 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4405,4 +4405,15 @@ export function getPrintTemplateList(params) {
 		url: baseApi + "/wms/print/modelList",
 		method: "get"
 	});
+}
+
+/**
+ * 物料变更
+ */
+export function fgChangeCommit(params) {
+	return request({
+		url: baseApi + "/wms/relegate-request-main/bind",
+		method: "post",
+		data: params,
+	});
 }
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index 82b2eebe..76e837e8 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -156,7 +156,7 @@
 					pageSize: 100,
 				}
 				getBalanceByFilter(params).then(res => {
-					if (res.length == 0) {
+					if (res.data.list.length == 0) {
 						this.showErrorMessage('未查找到该包装的库存余额', res => {
 							this.packGetFocus();
 						})
@@ -186,7 +186,13 @@
 			change(e) {
 				this.show = e.show
 			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
 
+					}
+				});
+			},
 		}
 	}
 </script>
diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
index 93b0b003..319682e6 100644
--- a/src/pages/fg/fgChange.vue
+++ b/src/pages/fg/fgChange.vue
@@ -83,7 +83,8 @@
 <script>
 	import {
 		getSpareitemcode,
-		getProductreceiptDetailbByPackingNumber
+		getProductreceiptDetailbByPackingNumber,
+		fgChangeCommit
 	} from '@/api/request2.js';
 
 	import {
@@ -313,14 +314,21 @@
 			},
 
 			commitChange() {
-				// uni.showLoading({
-				// 	title:'提交中...',
-				// 	mask:true
-				// })
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				})
 
 				let params = this.setParams();
 				console.log('params', JSON.stringify(params))
+				fgChangeCommit(params).then(res => {
 
+					let ss = res;
+
+
+				}).catch(err => {
+					this.showErrorMessage(err.message)
+				})
 			},
 
 
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 3ba53a5a..c1a25789 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 
 		<view class="page-wraper" v-if="detailSource.length>0">
@@ -9,8 +9,9 @@
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" :isShowStatus="false"
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowStatus="false" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
 							</record-com-detail-card>
 						</view>
 						<view class='split_line'></view>
@@ -33,9 +34,15 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
+
+		<!-- <win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
+		<!-- 	<win-com-scan-balance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="bussinessCode">
+		</win-com-scan-balance> -->
+
+
+		<!-- <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location> -->
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -73,6 +80,8 @@
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import winScanPackage from '@/mycomponents/scan/winScanPackage.vue'
+
 	import {
 		updateTitle
 	} from '@/common/basic.js';
@@ -87,7 +96,8 @@
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,
-			recordComDetailCard
+			recordComDetailCard,
+			winScanPackage
 		},
 		data() {
 			return {
@@ -101,30 +111,30 @@
 				fromLocationAreaTypeList: [],
 				tolocationTypeList: [],
 				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
+				outInventoryStatus: "", //来源出库库存状态:"",
+				bussinessCode: "ProductPutaway",
 				businessType: {},
 				managementList: [],
-				type:''
+				type: ''
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title
+				title: option.title
 			})
 			this.type = option.type
-			if(this.type=='predict'){
+			if (this.type == 'predict') {
 				updateTitle('制品上架记录')
-			}else if(this.type=='assemble'){
+			} else if (this.type == 'assemble') {
 				updateTitle('装配上架记录')
 			}
-			
-			var typeCode = "ProductPutaway"
-			getBusinessType(typeCode, res => {
+
+			getBusinessType(this.bussinessCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
 					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
 					this.tolocationTypeList = res.tolocationTypeList;
-					this.showFromLocationPopup();
+					this.openScanPopup();
 				} else {
 					this.showErrorMessage(res.message)
 				}
@@ -211,18 +221,20 @@
 			},
 
 			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
+				setTimeout(r => {
+					this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType);
 				})
-
+				// setTimeout(r => {
+				// 	this.$refs.scanPopup.openScanPopup(this.businessType);
+				// 	this.scanPopupGetFocus();
+				// })
 			},
+			// showFromLocationPopup() {
+			// 	this.$nextTick(() => {
+			// 		this.$refs.scanLocationCode.openScanPopup();
+			// 	})
+
+			// },
 			closeScanPopup() {
 				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.closeScanPopup();
@@ -344,15 +356,15 @@
 
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
-							
+
 							submitItem.qty = detail.handleQty;
-							submitItem.package ="";
+							submitItem.package = "";
 							subList.push(submitItem)
 						}
 					})
 				})
 				this.dataContent.subList = subList;
-				if(this.type){
+				if (this.type) {
 					this.dataContent.type = this.type;
 				}
 				this.dataContent.creator = creator;
@@ -406,7 +418,7 @@
 					this.clearData();
 				})
 			},
-			clearData(){
+			clearData() {
 				this.fromLocationCode = '';
 				this.subList = [];
 				this.detailSource = [];
@@ -462,4 +474,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index d2287038..c4377232 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -17,7 +17,7 @@
 						<view class="cell_info">
 							<view class="text_lightblue">生产线</view>
 							<view>
-								{{jobContent.subList[0].productionLineCode}}
+								{{productionLineCode}}
 							</view>
 						</view>
 						<view class="cell_info">
@@ -40,7 +40,6 @@
 		<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="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData"
@@ -138,7 +137,8 @@
 				jobStatus: "",
 				jobToLocationCode: "",
 				status: '',
-				scanMessage: ""
+				scanMessage: "",
+				productionLineCode: ""
 			};
 		},
 		onLoad(option) {
@@ -223,8 +223,10 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
-							that.jobStatus = res.data.status
-							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.jobStatus = res.data.status;
+							that.jobToLocationCode = that.subList[0].toLocationCode;
+							that.productionLineCode = that.jobContent.subList[0].productionLineCode;
+
 							if (that.jobContent.allowModifyLocation == 'FALSE') {
 								that.toLocationCode = that.subList[0].toLocationCode
 							}
diff --git a/src/pages/productionReceipt/coms/comProductionRecord.vue b/src/pages/productionReceipt/coms/comProductionRecord.vue
index 50456a6f..685a24b3 100644
--- a/src/pages/productionReceipt/coms/comProductionRecord.vue
+++ b/src/pages/productionReceipt/coms/comProductionRecord.vue
@@ -18,7 +18,7 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<!-- 	<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
 								:isShowLocation="true"></balance> -->
-							<production-label :dataContent="item" :packageContent="item.package" :isShowStdPack="false"></production-label>
+							<production-label :dataContent="item" :packageContent="item.package" :isShowStdPack="false" :isShowLocation="false"></production-label>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<view class='split_line'></view>