剩余模块：生产退料

pages/BatchOutOftock/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="app status-bar-gap">
-		<l-header title="批量销售出库" sticky #right>
+		<l-header :title=" t('home.plxsck') " sticky #right>
 			<view style="margin-right: 32rpx;" v-if="state.tabsIndex === '1'" @click="submit()">{{ t('verify.tj') }}</view>
 		</l-header>
 		<view class="page">
@@ -32,8 +32,8 @@
 		queryString: '',
 		tabsIndex: '1',
 		tabsList: [
-			{ name: computed(() => '所选单据'), type: '1' },
-			{ name: computed(() => '验证单据'), type: '2' },
+			{ name: computed(() => t('index.sxdj')), type: '1' },
+			{ name: computed(() => t('index.yzdj')), type: '2' },
 		],
 	})
 	const scanConfirmFun = (e : any) => {

pages/BatchOutOftock/material.vue

@@ -61,7 +61,7 @@
 			</view>
 		</view>
 	</view>
-	<scanFrame ref="scanFrameRef" @confirmation="scanFrameCnfirmation"
+	<scanFrame ref="scanFrameRef" @confirmation="scanFrameCnfirmation" :qtyState="true"
 		@scanFrameDataFeedback="(res:object)=>{state.scanFrameDataFeedback = res}"
 		@fast="(row:any)=>{state.scanFrameDataFeedback = row}" @err="scanFrameErrFun" @boxShow="scanFrameBoxShowShow" />
 	<shortcut ref="shortcutRef" @dataToscanFrame="dataToscanFrameFun" @boxShow="shortcutBoxShowShow" />
@@ -104,6 +104,7 @@
 		inputFocus: true,
 		scanFrameDataFeedback: {},
 		shortcutDataFeedback: {},
+		code:''
 	})
 	onLoad((pageData : any) => {
 		console.log(pageData);
@@ -124,7 +125,8 @@
 		// scanFrameRef.value.stateShow(true)
 	})
 	const scanConfirmFun = (e : any) => {
-		getReceiveBillScanData(e)
+		if(e != '') state.code = e
+		getReceiveBillScanData(state.code)
 	}
 	const shortcutBoxShowShow = (val : boolean) => {
 		state.shortcutRefShow = val
@@ -152,6 +154,9 @@
 		if (debounceTimer.value !== null) clearTimeout(debounceTimer.value)
 		debounceTimer.value = setTimeout(() => {
 			state.queryString = e
+			if(e != '') state.code = e
+			console.log(state.code);
+			console.log(state.queryString);
 			if (state.queryString !== '') getReceiveBillScanData(e)
 		})
 	}
@@ -198,13 +203,14 @@
 		const str = JSON.stringify(obj);
 		console.log(item);
 		temporaryScanDraftSave({
-			FVHUBFormId: "SAL_OUTSTOCK", 		//数据类型
+			FVHUBFormId: "SAL_OUTSTOCK", 				//数据类型
 			FVHUBFBillNo: state.FBillNo,	  		//单据编号
-			FVHUBScanNumber: state.queryString,		//条码
+			FVHUBScanNumber: state.code,				//条码
 			FVHUBMaterialNumber: item.articlesStr,	//物料编码
-			FVHUBScanQty: item.quantityStr + '',	//扫描数量
+			FVHUBScanQty: item.quantityStr + '',		//扫描数量
 			FVHUBEntryId: scanFrameRef.value.state.receiveBillScanData.Id, //物料ID
-			FVHUBFlot: item.batchNumberStr,			//批号
+			FVHUBFlot: item.batchNumberStr,					//批号
+			FVHUBJSON: item.FVHUBJSON,					//序列号
 			FVHUBStock: {
 				FNUMBER: item.warehouseData.FNUMBER	//仓库编号
 			},
@@ -263,19 +269,17 @@
 									EntryIds.push(item.FVHUBEntryId)
 									ids.push(item.FID)
 									ScanEntry.push({
-										FENTRYID: item.FVHUBEntryId,
-										Qty: item.FVHUBScanQty,
-										Flot: item.FVHUBFlot,
-										StockId: item.FVHUBStock,
-										StockFlex: item.FVHUBStockFlex,
-										Sno: item.FVHUBJSON
+										Ids:state.materialId,
+										EntryIds: item.FVHUBEntryId,
+										// Qty: item.FVHUBScanQty,
+										// Flot: item.FVHUBFlot,
+										// StockId: item.FVHUBStock,
+										// StockFlex: item.FVHUBStockFlex, 
+										FMaxcessSNo: item.FVHUBJSON
 									})
 								})
 								//推送数据
-								SAL_OUTSTOCKCheck({
-									Ids: state.materialId,
-									EntryIds: EntryIds.toString(),
-								}).then((res : any) => {
+								SAL_OUTSTOCKCheck({Items:ScanEntry}).then((res : any) => {
 									if (res.code === 200) {
 										fStockFlexDetailDelete({ Ids: ids.toString() }).then((res : any) => {
 											if (res.code === 200) {
@@ -283,6 +287,8 @@
 												uni.$u.toast('操作成功')
 											}
 										})
+									} else {
+										uni.$u.toast(res.msg)
 									}
 
 								})
@@ -304,7 +310,7 @@
 	 */
 	const fnDataList = (FBillNo : any) => {
 		let param = {
-			id: FBillNo,
+			Id: FBillNo,
 		};
 		uni.showLoading({ mask: true });
 		SAL_OUTSTOCKView(param).then(res => {

pages/BatchOutOftock/packing.vue

@@ -118,6 +118,9 @@
 			}
 		});
 	}
+	const fnToUrl = (item : any) => {
+		toPages('/pages/BatchOutOftock/material',{id:item.id,fBillNo:item.fBillNo})
+	}
 	/**
 	 * 数据推送
 	 */
@@ -161,12 +164,16 @@
 										AutoAudit: 'true',
 										ScanEntry: ScanEntry
 									}
-								}).then((res : any) => {
-									if (res.code === 200) {
+								}).then((resA : any) => {
+									console.log(resA);
+									if (resA.code === 200) {
 										fStockFlexDetailDelete({ Ids: ids.toString() }).then((res : any) => {
+											
 											if (res.code === 200) {
 												fnDataList();
 												uni.$u.toast(t('public.cg'))
+												console.log({id:resA.data.SuccessEntitys[0].Id,fBillNo:resA.data.SuccessEntitys[0].Number});
+												fnToUrl({id:resA.data.SuccessEntitys[0].Id,fBillNo:resA.data.SuccessEntitys[0].Number})
 											}
 										})
 									} else {

pages/BatchOutOftock/scattered.vue

@@ -5,7 +5,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">销售出库单单号：{{item.FBillNo}}</view>
+					<view class="tit">{{ t('index.sdn') }}：{{item.FBillNo}}</view>
 					<view class="line-p"></view>
 					<view class="b-font">{{ t('receive.rq') }}：{{item.FDateFormat}}</view>
 				</view>