剩余模块：生产退料

pages/material/index.vue

@@ -18,7 +18,7 @@
 					<view class="list-box-list" v-if="state.dataList.length > 0">
 						<view class="data-item" @click.stop="fnToUrl(item)"
 							v-for="(item, index) in state.dataList" :key="index">
-							<view class="tit">{{ t('index.scdd') }}：{{item.FBillNo}}</view>
+							<view class="tit">{{ t('index.scdd') }}：{{item.FMOBillNO}}</view>
 							<view class="line-p"></view>
 							<view class="b-font">{{ t('receive.rq') }}：{{item.FDateFormat}}</view>
 						</view>
@@ -74,7 +74,7 @@
 		}
 	}
 	const fnToUrl = (item : any) => {
-		toPages('/pages/material/material',{id:item.FID,fBillNo:item.FBillNo})
+		toPages('/pages/material/material',{id:item.FID,fBillNo:item.FMOBillNO})
 	}
 	const debounceTimer = ref()
 	const changeFun = (e : any) => {
@@ -91,6 +91,7 @@
 			queryString: state.queryString,
 			pageIndex: state.page.pageIndex,
 			pageSize: state.page.pageSize,
+			FType:'Pick'
 		};
 		if (state.page.pageIndex == 1) {
 			uni.showLoading({ mask: true });

pages/material/material.vue

@@ -97,6 +97,7 @@
 			totalCount: 0
 		},
 		FBillNo: '',
+		BillNo: '',
 		materialId: '',
 		supplierName: '',
 		inputFocus: true,
@@ -149,12 +150,14 @@
 	const getReceiveBillScanData = (val : string) => {
 		PRDPPBOMScanData({
 			FBarCode: val,
-			FBillNo: state.FBillNo,
-			IsFeed: 'true'
+			FBillNo: state.BillNo,
+			IsFeed: 'false'
 		}).then((res : any) => {
 			if (res.data !== null) {
 				console.log(res);
-				scanFrameRef.value.getreceiveBillScanData({ ...res.data, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate })
+				const scanData = res.data
+				if( scanData.UnScanQty > scanData.BarCodeQty ) scanData.UnScanQty = scanData.BarCodeQty
+				scanFrameRef.value.getreceiveBillScanData({ ...scanData, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate })
 				if (Object.keys(state.shortcutDataFeedback).length) {
 					if (state.shortcutDataFeedback.scanFrameShowSate) {
 						scanFrameRef.value.stateShow(true)
@@ -189,7 +192,7 @@
 		console.log(item);
 		temporaryScanDraftSave({
 			FVHUBFormId: "PRD_PPBOM", 		//数据类型
-			FVHUBFBillNo: state.FBillNo,	  		//单据编号
+			FVHUBFBillNo: state.BillNo,	  		//单据编号
 			FVHUBScanNumber: state.queryString,		//条码
 			FVHUBMaterialNumber: item.articlesStr,	//物料编码
 			FVHUBScanQty: item.quantityStr + '',	//扫描数量
@@ -201,6 +204,7 @@
 			FVHUBMaterial: {
 				FNUMBER: item.articlesStr
 			},
+			FType: "Picking",
 			...JSON.parse(str),
 		}).then((res : any) => {
 			console.log(res);
@@ -225,7 +229,7 @@
 	const scanRecordFun = () => {
 		toPages('/pages/records/index', {
 			FormId: 'PRD_PPBOM',
-			FbillNo: state.FBillNo
+			FbillNo: state.BillNo
 		})
 	}
 	/**
@@ -301,11 +305,13 @@
 	const fnDataList = (FBillNo : any, statesItem : boolean = false) => {
 		let param = {
 			id: FBillNo,
+			IsFeed:'false'
 		};
 		uni.showLoading({ mask: true });
 		PRDPPBOMView(param).then(res => {
 			uni.hideLoading();
 			if (res.code == 200) {
+				state.BillNo = res.data.BillNo
 				state.dataList = []
 				let dataListArray = res.data.Entry;
 				if (dataListArray.length > 0) {