修改无计划完工

src/api/request2.js

@@ -568,6 +568,22 @@ export function getProductionlineItem(params) {
 	});
 }
 
+
+/**
+ * 查询生产线物料关系
+ * @param {*} productionLineCode  生产线code
+ * 
+ */
+export function getBomVersionByProductionline(productionline) {
+	return request({
+		url: baseApi + "/wms/productionlineitem/getBomVersionByProductionline?productionline=" + productionline,
+		method: "get",
+		data: {},
+	});
+}
+
+
+
 /**
  * 通过物料查询包装规格
  * @param {*} itemCode 

src/pages/fg/coms/comNoReceiptPopup.vue

@@ -13,14 +13,13 @@
 					<view class='split_line'></view>
 					<view class="uni-flex uni-column" style="background-color: white; ">
 						<view class="uni-flex uni-column">
-
 							<view class="title " style="display: flex; align-items: center;padding: 10rpx;">
 								<text style=" flex-shrink: 0;width: 25%;">生产线：</text>
 								<view class="customerBorder" @click="showSelectLine">
 									{{productionLineName}}
 								</view>
-								<u-select v-model="showProductLineSelect" mode="mutil-column-auto" title="请选择生产线和工位"
-									:list="productLineList" @confirm="confirmSelectLine"></u-select>
+								<u-select v-model="showProductLineSelect" mode="mutil-column-auto"
+									:list="productLineList" @confirm="confirmSelectLine" title="生产线-工位"></u-select>
 
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
@@ -49,8 +48,11 @@
 								<view class="customerBorder">
 									{{itemCode}}
 								</view>
-								<u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList"
-									@confirm="confirmSelectItem"></u-select>
+								<view v-if="bomVersion" class="">
+									Bom版本{{bomVersion}}
+								</view>
+								<u-select v-model="showItemCodeSelect" mode="mutil-column-auto" :list="itemCodeList"
+									@confirm="confirmSelectItem" title="物料代码-Bom版本"></u-select>
 								<view class="">
 									<image src="/static/icons/down.svg" mode=""
 										style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;"
@@ -113,7 +115,7 @@
 		getPlaneInfoByproductLine,
 		getPackUnitByItemCode,
 		getProductionlineAndWorkStation,
-		getProductionlineItem
+		getBomVersionByProductionline
 	} from '@/api/request2.js';
 	import {
 		getPackUnitName,
@@ -145,7 +147,8 @@
 		},
 		data() {
 			return {
-				itemCode: '请选择物料信息',
+				itemCode: '',
+				itemName: '请选择物料信息',
 				uom: "",
 				qty: null,
 				planQty: 0,
@@ -170,7 +173,10 @@
 				showDateSelect: false,
 				planDateList: [],
 				fgLocationCode: "",
-				rawLocationCode: ""
+				rawLocationCode: "",
+				workshop: "",
+				bomVersion: "",
+				uom:""
 			}
 		},
 		props: {
@@ -217,6 +223,7 @@
 				this.planDateList = []
 				this.fgLocationCode = ""
 				this.rawLocationCode = ""
+				this.workshop=""
 
 			},
 
@@ -264,7 +271,7 @@
 			callback() {
 				let item = {
 					productionLineName: "",
-					productionLineCode: "", //生产线
+					productionLineCode: this.productLineCode, //生产线
 					itemCode: this.itemCode,
 					itemName: this.itemName,
 					uom: this.getUomInfo(this.uom),
@@ -278,7 +285,8 @@
 					planNumber: "",
 					workStationCode: this.workStationCode,
 					fgLocationCode: this.fgLocationCode,
-					rawLocationCode: this.rawLocationCode
+					rawLocationCode: this.rawLocationCode,
+					workshop:this.workshop
 				};
 				this.closeRequestPopup();
 				this.$emit("confirm", item);
@@ -300,6 +308,8 @@
 				var parent = this.productLineList.filter(res => res.value == this.productionLineCode)
 				var fgLocation = parent[0].children.filter(children => children.value == this.workStationCode)
 				this.fgLocationCode = fgLocation[0].fgLocationCode;
+				this.workshop = parent[0].workshop;
+				
 				this.clearItemCode()
 				this.clearPackUnit()
 
@@ -363,20 +373,10 @@
 					title: "加载中",
 					mask: true
 				})
-				let param = {
-					pageSize: 20,
-					pageNo: 1,
-					productionLineCode: this.productionLineCode
-				};
-
-				getProductionlineItem(param).then(res => {
+				getBomVersionByProductionline(this.productionLineCode).then(res => {
 					uni.hideLoading()
-					if (res.data.list && res.data.list.length > 0) {
-						res.data.list.forEach(item => {
-							item.label = item.itemCode
-							item.value = item
-						})
-						this.itemCodeList = res.data.list
+					if (res.data && res.data.length > 0) {
+						this.itemCodeList = res.data
 						this.showItemCodeSelect = true
 					} else {
 						this.showErrorMessage('未查找到物料信息');
@@ -387,9 +387,10 @@
 				})
 			},
 			confirmSelectItem(data) {
-				let itemInfo = data[0].value;
-				this.itemCode = itemInfo.itemCode;
-				this.uom = itemInfo.uom
+				this.itemCode = data[0].label;
+				this.bomVersion = data[1].value;
+				this.uom=data[0].uom;
+				// this.uom = itemInfo.uom
 
 				//清除其他数据
 				this.clearPackUnit();
@@ -470,11 +471,6 @@
 					return item.label
 				}
 			},
-
-
-
-
-
 		}
 	}
 </script>

src/pages/fg/receiptNoPlan.vue

@@ -9,7 +9,7 @@
 				<view class="cell_box uni-flex uni-row">
 					<view class="cell_info">
 						<view class="text_lightblue">完工库位</view>
-						<view style="font-size: 30rpx; margin-top: 13rpx;" >{{dataContent.fgLocationCode}}
+						<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
 						</view>
 
 					</view>
@@ -34,8 +34,8 @@
 					</view>
 					<view style="word-break: break-all; font-size: 35rpx; font-weight: bold;">
 						<text v-if="dataContent.handleQty>0" style="color: #FFA500;">{{dataContent.handleQty}}/</text>
-					<!-- 	{{dataContent.packQtyHint}} -->
-						<text  class="text_recommend" >{{dataContent.packQtyHint}}</text>
+						<!-- 	{{dataContent.packQtyHint}} -->
+						<text class="text_recommend">{{dataContent.packQtyHint}}</text>
 					</view>
 				</view>
 			</view>
@@ -47,7 +47,7 @@
 					<uni-swipe-action>
 						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
 							<view class="uni-flex uni-row "
-								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;"  >
+								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
 								<light :lightCode='item.content'></light>
 								<!-- <view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
 									<text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
@@ -124,7 +124,8 @@
 			pack,
 			winScanButton,
 			winScanFgLabel,
-			comFgCard,light
+			comFgCard,
+			light
 		},
 		data() {
 			return {
@@ -187,8 +188,13 @@
 					batch: result.batch,
 					packUnit: result.packUnit,
 					workStationCode: result.workStationCode,
-					fgLocationCode:result.fgLocationCode,
-					subList: []
+					fgLocationCode: result.fgLocationCode,
+					subList: [],
+					productionLine: result.productionLineCode,
+					bomVersion: result.bomVersion,
+					workshop: result.workshop,
+					team: "",
+					shift: ""
 				}
 			},
 
@@ -318,7 +324,7 @@
 						throw new Error("未查找到单据信息")
 					}
 					uni.hideLoading()
-					this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>"+list[0].requestNumber, list)
+					this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
 
 				} catch (error) {
 					uni.hideLoading()