diff --git a/src/api/mes/rfidProcess.js b/src/api/mes/rfidProcess.js index 4a1527b..3ed7655 100644 --- a/src/api/mes/rfidProcess.js +++ b/src/api/mes/rfidProcess.js @@ -8,7 +8,14 @@ export function listRfidProcess(query) { params: query }); } - +// 生产流程汇总列表 +export function listRfidProcessAll(query) { + return request({ + url: '/mes/rfidProcess/listAll', + method: 'get', + params: query + }); +} // 查询生产rfid流程详细 export function getRfidProcess(recordId) { return request({ diff --git a/src/api/plan/bpworkorder.js b/src/api/plan/bpworkorder.js index 281df1a..869f630 100644 --- a/src/api/plan/bpworkorder.js +++ b/src/api/plan/bpworkorder.js @@ -108,4 +108,13 @@ export function subChangeWorkOrderM(data){ method:'post', data:data }) - } \ No newline at end of file + } + +// 查询生产工单详细 +export function getBPNBomList(query) { + return request({ + url: '/plan/bppro/workorder/getBPNBomList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/api/quality/cpkUpdown.js b/src/api/quality/cpkUpdown.js index 9b9831f..0619e40 100644 --- a/src/api/quality/cpkUpdown.js +++ b/src/api/quality/cpkUpdown.js @@ -42,3 +42,12 @@ export function delCpkUpdown(id) { method: 'delete' }); } + +// 查询物料检验标准列表 +export function listMaterialCheckStandar(query) { + return request({ + url: '/quality/cpkUpdown/getMaterialCheckStandarList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/api/wms/matetowsn.js b/src/api/wms/matetowsn.js index 9f6124f..028e93a 100644 --- a/src/api/wms/matetowsn.js +++ b/src/api/wms/matetowsn.js @@ -22,6 +22,13 @@ export function cardBD(data) { data: data }); } +export function Removecard(data) { + return request({ + url: '/wms/matetowsn/Removecard', + method: 'post', + data: data + }); +} // 查询包材库存明细表详细 export function getMatetowsn(mateOrderInSnId) { return request({ diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue index 3c80610..48c3fc9 100644 --- a/src/views/kanban/dailyoutput/index.vue +++ b/src/views/kanban/dailyoutput/index.vue @@ -891,7 +891,7 @@ export default { factory: _this.selectxt, shiftId: _this.selectxtclasses, ymd: _this.datetime, - equTypeCode: "equ_type_spj", + equTypeCode: "equ_type_hf", }).then((response) => { if (response) { if (response.data) { diff --git a/src/views/mes/rfidProcessAll/index.vue b/src/views/mes/rfidProcessAll/index.vue new file mode 100644 index 0000000..0ff146a --- /dev/null +++ b/src/views/mes/rfidProcessAll/index.vue @@ -0,0 +1,349 @@ + + + diff --git a/src/views/plan/workorderBP/bpBome.vue b/src/views/plan/workorderBP/bpBome.vue new file mode 100644 index 0000000..5b32139 --- /dev/null +++ b/src/views/plan/workorderBP/bpBome.vue @@ -0,0 +1,179 @@ + + diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue index 7229e76..f3baf5d 100644 --- a/src/views/plan/workorderBP/index.vue +++ b/src/views/plan/workorderBP/index.vue @@ -174,6 +174,24 @@ v-hasPermi="['mes:bppro:workorder:edit']" >湿料计划删除 + + 辅助排产 + + + + 物料BOM + + + + SAP同步 + + @@ -630,6 +648,9 @@ 取 消 + + + @@ -649,9 +670,10 @@ import moment from 'moment'; import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order' import {prototype} from "clipboard"; import {getHourProductionList} from '@/api/plan/whiteOrder'; - +import ItemBoms from "./bpBome.vue"; export default { name: "WorkorderBP", + components: { ItemBoms}, dicts: ['product_type', 'workorder_type'], data() { return { @@ -661,6 +683,7 @@ export default { checkType: false, // 暂存线体code proLineCode: null, + titleM: '', // 打印 formRef: 'form', validateRules: [], @@ -1782,6 +1805,19 @@ export default { }).catch(() => { }); }, + //辅助排产 + handleAutoSplit(){ + this.$modal.msgSuccess("辅助排产成功，请确认！"); + }, + handleSAPSync(){ + this.$modal.msgSuccess("同步成功！"); + }, + //查看白坯bom + handleBom(row){ + const workorderIds = row.workorderId || this.ids; + this.$refs.itemSelectProject.showFlag = true; + this.$refs.itemSelectProject.init(workorderIds[0]); + }, } }; diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue index fb71aa7..a106d6e 100644 --- a/src/views/quality/incomeReport/index.vue +++ b/src/views/quality/incomeReport/index.vue @@ -66,6 +66,16 @@ v-hasPermi="['quality:incomeReport:export']" >导出 + + 报告Excel下载 + @@ -143,7 +153,7 @@ - {{form.factoryCode}} + {{form.productGroupName}} {{form.incomeBatchNo}} {{form.checkNo}} @@ -510,6 +520,14 @@ export default { ...this.queryParams }, `income_${new Date().getTime()}.xlsx`) }, + /** 导出报告按钮操作 */ + handleReportExport() { + const recordId =this.ids[0]; + this.queryParams.recordId = recordId; + this.download('quality/qcIncome/reportExport', { + ...this.queryParams + }, `incomeReportExport_${new Date().getTime()}.xlsx`) + }, /**获取检验项目列表 */ getCheckedProjectList(){ this.loading = true; diff --git a/src/views/quality/materailCheckStandar/index.vue b/src/views/quality/materailCheckStandar/index.vue new file mode 100644 index 0000000..179e23a --- /dev/null +++ b/src/views/quality/materailCheckStandar/index.vue @@ -0,0 +1,195 @@ + + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 4c7aaf2..80f45f5 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -87,6 +87,16 @@ v-hasPermi="['quality:produceReport:confirm']" >检验确认 + + 首检报告Excel下载 + @@ -1065,6 +1075,14 @@ export default { ...this.queryParams }, `produceReport_${new Date().getTime()}.xlsx`) }, + /** 导出报告按钮操作 */ + handleSCReportExport() { + const recordId =this.ids[0]; + this.queryParams.recordId = recordId; + this.download('quality/qcProduceReport/SCReportExport', { + ...this.queryParams + }, `SCReportExport_${new Date().getTime()}.xlsx`) + }, /**获取检验项目列表 */ getCheckedProjectList(){ this.loading = true; diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 2260719..1b8a9df 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -74,6 +74,16 @@ v-hasPermi="['quality:productReport:export']" >导出 + + 报告Excel下载 + @@ -86,7 +96,7 @@ - +