diff --git a/src/api/wmsManagement/wmBlankRecord.js b/src/api/wmsManagement/wmBlankRecord.js
index 7b0509a..3860a82 100644
--- a/src/api/wmsManagement/wmBlankRecord.js
+++ b/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,
+ })
}
\ No newline at end of file
diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue
index c1c08b8..fad4b81 100644
--- a/src/views/qualityManagement/FQC/thirtyFQC.vue
+++ b/src/views/qualityManagement/FQC/thirtyFQC.vue
@@ -503,7 +503,7 @@
| 标签参考图片 |
-
+
@@ -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(() => {
diff --git a/src/views/wmsManagement/WmBlankInventory.vue b/src/views/wmsManagement/WmBlankInventory.vue
index b4b87ca..cf10e82 100644
--- a/src/views/wmsManagement/WmBlankInventory.vue
+++ b/src/views/wmsManagement/WmBlankInventory.vue
@@ -55,8 +55,8 @@
-
-
+
+
diff --git a/src/views/wmsManagement/WmMaterial.vue b/src/views/wmsManagement/WmMaterial.vue
index 0af828a..351a218 100644
--- a/src/views/wmsManagement/WmMaterial.vue
+++ b/src/views/wmsManagement/WmMaterial.vue
@@ -16,6 +16,9 @@
+
+
+
@@ -76,6 +79,12 @@
+
+
+ 成品
+ 毛坯
+
+
正常
diff --git a/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue b/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
index e9435b2..9417258 100644
--- a/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
+++ b/src/views/wmsManagement/components/TheWmBlankRecord/TheWmBlankRecord.vue
@@ -34,7 +34,10 @@
- {{scope.row.type === 1? `+ ${scope.row.changeQuantity}` : `- ${scope.row.changeQuantity}`}}
+ {{`+ ${scope.row.changeQuantity}`}}
+ {{`- ${scope.row.changeQuantity}`}}
+ {{`- ${scope.row.changeQuantity}`}}
+ {{`${scope.row.changeQuantity}`}}
@@ -43,7 +46,7 @@
入库
出库
PDA上料出库
- 盘点
+ 盘点
@@ -90,7 +93,7 @@
-
+
@@ -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;
+ }
+ })
}
-
}
}
}
|