毛坯库存盘点，包装毛坯自动扣除，物料清单查看等功能完善，需要一定时间测试，不稳定

src/api/wmsManagement/wmBlankRecord.js

@@ -79,4 +79,29 @@ export function reduceInventoryNum(query) {
     method: 'get',
     params: query,
   })
+}
+
+/**
+* 毛坯库存盘点
+* @param {查询条件} data
+*/
+export function doStocktakingBlankInventory(query) {
+  return request({
+    url: '/mes/wm/WmBlankRecord/doStocktakingBlankInventory',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+/**
+* 根据工单号出库毛坯
+* @param {查询条件} data
+*/
+export function doOutboundByWorkOrderId(query) {
+  return request({
+    url: '/mes/wm/WmBlankRecord/doOutboundByWorkOrderId',
+    method: 'get',
+    params: query,
+  })
 }

src/views/qualityManagement/FQC/thirtyFQC.vue

@@ -503,7 +503,7 @@
 							<td>标签参考图片</td>
 							<td>
 								<span @click="openImageViewer">
-									<el-image ref="elImageRef" style="width: 40px; height: 40px" :src="imageUrl" >
+									<el-image ref="elImageRef" style="width: 40px; height: 40px" :src="imageUrl">
 									</el-image>
 									<el-image-viewer style="width: 60%;height: 80%;" v-if="showViewer" :on-close="closeImageViewer" :url-list="[imageUrl]" />
 								</span>
@@ -631,6 +631,9 @@
 	import {
 		GetQcQualityStatisticsFirstStartTime,
 	} from '@/api/qualityManagement/firstFQC.js'
+	import {
+		doOutboundByWorkOrderId,
+	} from '@/api/wmsManagement/wmBlankRecord.js';
 	import { convertToIncomingInspectionData } from '@/api/wmsManagement/wmFgentryInspect.js'
 	import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 	export default {
@@ -871,8 +874,19 @@
 				this.$modal
 					.confirm('是否确认完成本工单？')
 					.then(() => {
-
 						this.$notify.success(`已完成工单${saveWorkorderInfo.clientWorkorder}，即将跳转下一个工单`);
+						// 毛坯库存出库
+						this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},开始同步毛坯库存！`)
+						const queryData = {
+							workOrderId: saveWorkorderInfo.clientWorkorder
+						}
+						doOutboundByWorkOrderId(queryData).then(res => {
+							if (res.code === 200) {
+								this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},毛坯库存已扣除！`)
+							}
+						}).catch((err) => {
+
+						})
 						//todo  更改这个工单状态为2
 						this.getNext_current_workorder().then(() => {
 							setTimeout(() => {

src/views/wmsManagement/WmBlankInventory.vue

@@ -55,8 +55,8 @@
 		<!-- 数据区域 -->
 		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
-			<el-table-column prop="blankNum" label="毛坯号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="blankNum" label="毛坯号" align="center" min-width="160" :show-overflow-tooltip="true" />
-			<el-table-column prop="description" label="产品描述" align="center" width="280" :show-overflow-tooltip="true" />
+			<el-table-column prop="description" label="产品描述" align="center" min-width="280" :show-overflow-tooltip="true" />
 			<el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" />
 			<!-- <el-table-column prop="unit" label="单位" align="center" :show-overflow-tooltip="true" /> -->
 			<el-table-column prop="quantity" label="库存数量" align="center" />

src/views/wmsManagement/WmMaterial.vue

@@ -16,6 +16,9 @@
 			<el-form-item label="库存编码" prop="u8InventoryCode">
 				<el-input v-model="queryParams.u8InventoryCode" placeholder="请输入U8库存编码" :clearable="true" />
 			</el-form-item>
+			<el-form-item label="毛坯号" prop="blankNum">
+				<el-input v-model="queryParams.blankNum" placeholder="请输入毛坯号" :clearable="true" />
+			</el-form-item>
 			<el-form-item label="产品描述" prop="productName">
 				<el-input v-model="queryParams.productName" placeholder="产品描述（产品名称）" :clearable="true" />
 			</el-form-item>
@@ -76,6 +79,12 @@
 			<el-table-column prop="description" label="显示描述" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="version" label="版本号" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="type" label="状态" align="center">
+				<template slot-scope="scope">
+					<el-tag type="primary" v-if="scope.row.type === 1">成品</el-tag>
+					<el-tag type="warning" v-if="scope.row.type === 2">毛坯</el-tag>
+				</template>
+			</el-table-column>
 			<el-table-column prop="status" label="状态" align="center">
 				<template slot-scope="scope">
 					<el-tag type="success" v-if="scope.row.status === 1">正常</el-tag>

src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue

@@ -34,7 +34,10 @@
 				<el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" />
 				<el-table-column prop="changeQuantity" label="变动数量" align="center">
 					<template slot-scope="scope">
-						<span style="font-weight: 700;">{{scope.row.type === 1? `+ ${scope.row.changeQuantity}`  : `- ${scope.row.changeQuantity}`}}</span>
+						<span style="font-weight: 700;" v-if="scope.row.type === 1">{{`+ ${scope.row.changeQuantity}`}}</span>
+						<span style="font-weight: 700;" v-if="scope.row.type === 2">{{`- ${scope.row.changeQuantity}`}}</span>
+						<span style="font-weight: 700;" v-if="scope.row.type === 3">{{`- ${scope.row.changeQuantity}`}}</span>
+						<span style="font-weight: 700;" v-if="scope.row.type === 4">{{`${scope.row.changeQuantity}`}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column prop="actionTime" label="入库/出库时间" align="center" min-width="160" :show-overflow-tooltip="true" />
@@ -43,7 +46,7 @@
 						<el-tag effect="plain" v-if="scope.row.type === 1" type="success">入库</el-tag>
 						<el-tag effect="plain" v-if="scope.row.type === 2" type="danger">出库</el-tag>
 						<el-tag effect="plain" v-if="scope.row.type === 3" type="danger">PDA上料出库</el-tag>
-						<el-tag effect="plain" v-if="scope.row.type === 4" type="warnging">盘点</el-tag>
+						<el-tag effect="plain" v-if="scope.row.type === 4" type="warning">盘点</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="remark" label="备注原因" align="center" :show-overflow-tooltip="true" />
@@ -90,7 +93,7 @@
 							<el-select v-model="formAdd.actionType">
 								<el-option label="入库" :value="1"></el-option>
 								<el-option label="出库" :value="2"></el-option>
-								<el-option label="盘点" :value="4" disabled></el-option>
+								<el-option label="盘点" :value="4"></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -136,7 +139,8 @@
 		updateWmBlankRecord,
 		getWmBlankRecord,
 		addInventoryNum,
-		reduceInventoryNum
+		reduceInventoryNum,
+		doStocktakingBlankInventory
 	} from '@/api/wmsManagement/wmBlankRecord.js';
 	import {
 		getWmBlankInventory,
@@ -231,7 +235,7 @@
 					this.loading = false;
 				})
 			},
-			updateQuantity(){
+			updateQuantity() {
 				// 库存值更新
 				getWmBlankInventory(this.ItemData.id).then((res) => {
 					const { code, data } = res;
@@ -296,7 +300,7 @@
 							this.addDialogOpen = false;
 						}
 					})
-				} else {
+				} else if (this.formAdd.actionType === 2) {
 					// 出库
 					reduceInventoryNum(data).then(res => {
 						if (res.code === 200) {
@@ -311,9 +315,23 @@
 							this.addDialogOpen = false;
 						}
 					})
+				} else if (this.formAdd.actionType === 4) {
+					// 盘点
+					doStocktakingBlankInventory(data).then(res => {
+						if (res.code === 200) {
+							if (res.data < 1) {
+								this.$message.error("添加记录失败！");
+								return;
+							}
+							this.$message.success("添加记录成功！");
+							this.getList();
+							this.emitRefresh();
+							this.initData();
+							this.addDialogOpen = false;
+						}
+					})
 				}
 
-
 			}
 		}
 	}