11

pages/material/material.vue

@@ -269,7 +269,7 @@
 								//推送数据
 								PRDPPBOMPush({
 									EntryIds: EntryIds.toString(),
-									TargetFormId: 'PRD_FeedMtrl',
+									TargetFormId: 'PRD_PickMtrl',
 									IsEnableDefaultRule: 'true',
 									CustomParams: {
 										AutoAudit: 'true',
@@ -306,7 +306,6 @@
 	const fnDataList = (FBillNo : any, statesItem : boolean = false) => {
 		let param = {
 			id: FBillNo,
-			IsInStock:'false'
 		};
 		uni.showLoading({ mask: true });
 		PRDPPBOMView(param).then(res => {
@@ -320,11 +319,11 @@
 							Id: p.Id,
 							MaterialNo: p.MaterialNumber, //物料编码
 							MaterialName: formatLangTextValue(p.MaterialName),  //物料名称
-							Lot: p.FLot_Text,    //批号
+							Lot: p.FLot_Text,    	//批号
 							CheckQty: p.Qty,  		//应扫数量
 							CheckJoinQty: p.ScanedQty,	//已扫数量
-							NoCheckQty: p.UnScanQty, //未扫数量
-							MultiLanguageText:formatLangTextValue(p.StockId.Name)
+							NoCheckQty: p.UnScanQty, 	//未扫数量
+							MultiLanguageText: Object.keys(p.StockId).length ? formatLangTextValue(p.StockId.Name) : ''
 						};
 						state.dataList.push(item);
 					});