55

api/pda/workOrder.js

@@ -691,3 +691,17 @@ export async function qualityQy(params) {
 	}
 	return Promise.reject(data.message);
 }
+
+
+// 根据工单工序查已入库的委外申请
+
+export async function listOutsource(param) {
+	const data = await get(
+		Vue.prototype.apiUrl + `/mes/applyoutsource/listOutsource`, param
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}

pages/pda/feeding/components/palletBom.vue

@@ -45,7 +45,7 @@
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.extInfo.formedNum" type='digit' :disabled="isDetails"></input>
+						<input class="uni-input" v-model="item.feedQuantity" type='digit' :disabled="isDetails"></input>
 					</view>
 				</view>
 

pages/pda/picking/components/boatBom.vue

@@ -46,7 +46,7 @@
 					<view class="lable rx-cc">数量 </view>
 					<view class="content content_num">
 						<input class="uni-input" style="width: 300rpx;" v-model="item.demandQuantity"
-							type='digit'></input> {{ item.unit}} <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量:	{{ Number(item.count || 0) * Number(resObj.formingNum) }} 	 </text>
+							type='digit'></input> {{ item.unit }} <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量:	{{ Number(item.count || 0) * Number(resObj.formingNum) }} 	 </text>
 					
 
 					</view>

pages/pda/picking/details.vue

@@ -122,7 +122,8 @@
 	import semiProductBom from './components/semiProductBom'
 	import {
 		workorderList,
-		listOutsourceInWarehouse
+		listOutsourceInWarehouse,
+		listOutsource
 	} from '@/api/pda/workOrder.js'
 
 	import {
@@ -163,13 +164,19 @@
 
 
 
-			this.getList()
+			
 
 			if (this.idsList.length == 1) {
 				this.getPick()
 			}
 
 
+          if(this.isOutsource == 1) {
+			  this.getListOutsource()
+		  }  else {
+			  this.getList()
+		  }
+
 
 
 		},
@@ -364,6 +371,17 @@
 				this.$forceUpdate()
 
 			},
+			
+			getListOutsource() {
+				let param = {
+					workOrderId: this.idsList,
+					taskId: this.taskId
+				}
+				
+				listOutsource(param).then(res => {
+					console.log(res)
+				})
+			},