diff --git a/src/api/mes/selfMutualInspection.js b/src/api/mes/selfMutualInspection.js index dde9852..74f09d7 100644 --- a/src/api/mes/selfMutualInspection.js +++ b/src/api/mes/selfMutualInspection.js @@ -45,3 +45,21 @@ export function listFirstInspectionRight(query) { params: query }) } + +// 查询点检 +export function listPointInspection(query) { + return request({ + url: '/mes/inspectionReport/listPointInspection', + method: 'get', + params: query + }) +} + +// 查询点检listCheckBox +export function listCheckBox(query) { + return request({ + url: '/mes/inspectionReport/listCheckBox', + method: 'get', + params: query + }) +} diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 2e91c29..93473e6 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -211,3 +211,16 @@ export function getCkeckProjectXJList(query) { method: 'get' }) } + + //合并来料检验 +export function togetherTask(recordId,factoryCode) { + const data = { + recordId, + factoryCode + } + return request({ + url: '/quality/qcIncome/togetherTask', + method: 'post', + data: data + }); +} \ No newline at end of file diff --git a/src/api/wms/odsRawOrderIn.js b/src/api/wms/odsRawOrderIn.js index d81a5bc..28e7dda 100644 --- a/src/api/wms/odsRawOrderIn.js +++ b/src/api/wms/odsRawOrderIn.js @@ -42,3 +42,11 @@ export function delOdsRawOrderIn(rawOrderInId) { method: 'delete' }); } +// 新增包材到货单 +export function sap105temporarilyCollected(data) { + return request({ + url: '/wms/odsRawOrderIn/sap105temporarilyCollected', + method: 'post', + data: data + }); +} diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index 7d16276..54fdbc5 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -78,6 +78,7 @@ -
生产产线: {{ headerParameters.lineCode }}
+
生产产线: {{ headerParameters.lineName }}

 @@ -327,6 +327,7 @@ export default { productionWorkshop: null, //生产车间 reportName: 'ConversionReportRight', //表类型 lineCode: null, //生产产线编码 + lineName: null, //生产产线名称 checkPeople: null, //检查人 productName: null, //产品名称 checkDate: null, //检查日期 @@ -416,6 +417,7 @@ export default { resetQuery() { (this.headerParameters.productionWorkshop = null), //生产车间 (this.headerParameters.lineCode = null), //生产产线 + (this.headerParameters.lineName = null), //生产产线 (this.headerParameters.checkPeople = null), //检查人 (this.headerParameters.productName = null), //产品名称 (this.headerParameters.checkDate = null), //检查日期 @@ -437,6 +439,7 @@ export default { this.headerParameters.productName = response.productName; //产品名称 this.headerParameters.remark = response.remark; //备注 this.headerParameters.bz = response.bz; //异常处理 + this.headerParameters.lineName = response.lineName; //this.headerParameters.checkDate = response.checkDate 检查日期 //生产产线 }); diff --git a/src/views/mes/pointInspection/index.vue b/src/views/mes/pointInspection/index.vue new file mode 100644 index 0000000..606da1f --- /dev/null +++ b/src/views/mes/pointInspection/index.vue @@ -0,0 +1,643 @@ + + + + + \ No newline at end of file diff --git a/src/views/mes/selfMutualInspection/index.vue b/src/views/mes/selfMutualInspection/index.vue index 0b8fc0f..0147578 100644 --- a/src/views/mes/selfMutualInspection/index.vue +++ b/src/views/mes/selfMutualInspection/index.vue @@ -154,7 +154,7 @@
- 生产产线: {{ headerParameters.lineCode }} + 生产产线: {{ headerParameters.lineName }}

@@ -275,6 +275,7 @@ export default { reportName: "ConversionReport", //表类型 productionWorkshop: null, //生产车间 lineCode: null, //生产产线编码 + lineName: null, //生产产线名称 checkPeople: null, //检查人 productName: null, //产品名称 checkDate: null, //检查日期 @@ -367,6 +368,7 @@ export default { resetQuery() { (this.headerParameters.productionWorkshop = null), //生产车间 (this.headerParameters.lineCode = null), //生产产线 + (this.headerParameters.lineName = null), //生产产线 (this.headerParameters.checkPeople = null), //检查人 (this.headerParameters.productName = null), //产品名称 (this.headerParameters.checkDate = null), //检查日期 @@ -390,6 +392,7 @@ export default { this.headerParameters.productName = response.productName; //产品名称 this.headerParameters.remark = response.remark; //备注 this.headerParameters.bz = response.bz; //异常处理 + this.headerParameters.lineName = response.lineName; //this.headerParameters.checkDate = response.checkDate 检查日期 //生产产线 }); @@ -418,7 +421,7 @@ export default {