diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js
index fcce2694..891c63a9 100644
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -188,14 +188,14 @@ export function PurchasingDepartment(num, num1, time, MaterialNum, NumberOfParts
}
})
}
-export function Production(num, MaterialNum, projectFloatValue, machineFloatValue) {
+export function Production(num, MaterialNum, Number, projectFloatValue, machineFloatValue) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间管理_车间采购_基本件_传递数据',
- param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}`
+ param: `组件流水号=${num}&基本件流水号组=${MaterialNum}&零件数量组=${Number}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}`
}
})
}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index b286a08d..6914cc85 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -89,26 +89,16 @@
{{ scope.row.零件数量 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
{{ scope.row.零件备注 }}
-
-
- {{ scope.row.库存数量 }}
-
-
-
-
- {{ scope.row.需求数量 }}
-
-
-
-
- 使用
-
-
@@ -139,26 +129,16 @@
{{ scope.row.零件数量 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
{{ scope.row.备注 }}
-
-
- {{ scope.row.安全库存量 }}
-
-
-
-
- {{ scope.row.需求数量 }}
-
-
-
-
- 使用
-
-
@@ -189,26 +169,16 @@
{{ scope.row.零件数量 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
{{ scope.row.备注 }}
-
-
- {{ scope.row.安全库存量 }}
-
-
-
-
- {{ scope.row.需求数量 }}
-
-
-
-
- 使用
-
-
@@ -1103,6 +1073,7 @@ export default {
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].零件备注
}
+ console.log(this.NumberOfParts, 1111)
} else if (this.PartType === '外购件') {
this.MaterialNum = []
this.MaterialCode = []
@@ -1118,7 +1089,7 @@ export default {
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
- this.NumberOfParts[i] = val[i].需求数量
+ this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
} else if (this.PartType === '标准件') {
@@ -1136,7 +1107,7 @@ export default {
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
- this.NumberOfParts[i] = val[i].需求数量
+ this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
}
@@ -1259,7 +1230,7 @@ export default {
},
Production() {
if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) {
- Production(this.groupFloatValue, this.BasicPartsNumber, this.projectFloatValue, this.machineFloatValue).then(response => {
+ Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('投产成功')
searchPart(this.groupFloatValue).then(response => {
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index 48cfcce6..83562e30 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -298,6 +298,7 @@ export default {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
},
searchMachine() {
+ this.machineValue = ''
this.machine = []
initMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index ad82edb2..beae4984 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -69,10 +69,15 @@
{{ scope.row.组号 }}
{{ scope.row.零件数量 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
@@ -159,6 +164,11 @@
{{ scope.row.零件数量 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
{{ scope.row.零件类型 }}