diff --git a/src/api/system/orderPro.js b/src/api/system/orderPro.js index ec1b904..8f7e642 100644 --- a/src/api/system/orderPro.js +++ b/src/api/system/orderPro.js @@ -140,7 +140,7 @@ export function uploadPDF(id) { // 下载生产工艺计划表 export function exportRoute(id) { return request({ - url: `/system/orderPro/exportRoute?id=${id}`, + url: `/system/orderPro/exportRoute2?id=${id}`, method: 'post', responseType: 'blob' }) diff --git a/src/api/system/route.js b/src/api/system/route.js index 6fa7a56..aeeb355 100644 --- a/src/api/system/route.js +++ b/src/api/system/route.js @@ -91,11 +91,11 @@ export function delRoute(id) { }) } -export function pushRouteBom(rooteProdet) { +export function pushRouteBom(rooteProdet, groupName) { return request({ url: '/system/route/pushRouteBom', method: 'post', - params: { rooteProdet }, + params: { rooteProdet, groupName }, }); } export function updateProcessPlan(rooteProdet, ids) { diff --git a/src/api/system/spec35r.js b/src/api/system/spec35r.js new file mode 100644 index 0000000..2c9684d --- /dev/null +++ b/src/api/system/spec35r.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询35R设备规格参数列表 +export function listSpec35r(query) { + return request({ + url: '/system/spec35r/list', + method: 'get', + params: query + }) +} + +// 查询35R设备规格参数详细 +export function getSpec35r(id) { + return request({ + url: '/system/spec35r/' + id, + method: 'get' + }) +} + +// 新增35R设备规格参数 +export function addSpec35r(data) { + return request({ + url: '/system/spec35r', + method: 'post', + data: data + }) +} + +// 修改35R设备规格参数 +export function updateSpec35r(data) { + return request({ + url: '/system/spec35r', + method: 'put', + data: data + }) +} + +// 删除35R设备规格参数 +export function delSpec35r(id) { + return request({ + url: '/system/spec35r/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/details/index.vue b/src/views/system/details/index.vue index e393f0d..1021ed1 100644 --- a/src/views/system/details/index.vue +++ b/src/views/system/details/index.vue @@ -128,6 +128,15 @@ >导入 + + + + { const item = this.detailsList.find(row => row.id === id); return { - fnumber: item.fnumber, // 物料编码 - totalWeight: item.totalWeight // 生产令号 + fnumber: item.fnumber, + totalWeight: item.totalWeight, + groupName: this.groupName.trim() }; }); - - console.log('发送数据:', selectedData); - - // 调用接口 updateFBl(selectedData).then(response => { this.form = response; const successCount = response.length; this.resNotice(successCount); + }).catch(error => { + console.error('更新BOM失败:', error); + this.$modal.msgError("更新BOM失败，请重试!"); }).finally(() => { this.loading = false; }); diff --git a/src/views/system/route/index.vue b/src/views/system/route/index.vue index e9cec9d..12c63de 100644 --- a/src/views/system/route/index.vue +++ b/src/views/system/route/index.vue @@ -19,7 +19,7 @@ - + 推送工艺 + + + 更新计划时间 @@ -591,8 +599,10 @@ @@ -646,7 +656,7 @@ DictData.install(); export default { name: "", dicts: ['work_center'], - + components: { Fromed, Bomfrom @@ -927,6 +937,7 @@ export default { selectedRoute: null, // 当前选中的工艺路线完整信息 currentProcessList: [], // 当前显示的工序列表 dataList: [], // 存储获取到的数据 + routeGroupName: '' }; }, created() { @@ -935,7 +946,7 @@ export default { if (this.params && this.params.productionOrderNo) { this.queryParams.routeDescription = this.params.productionOrderNo; } - + // const productionOrderNo = this.params.productionOrderNo; // if (productionOrderNo) { @@ -1512,6 +1523,10 @@ export default { this.$modal.msgError("未获取到生产订单号，请检查!"); return; } + if (!this.routeGroupName || !this.routeGroupName.trim()) { + this.$modal.msgError("请填写分组名称!"); + return; + } try { // 显示确认对话框 await this.$confirm( @@ -1541,14 +1556,14 @@ export default { }); // 调用推送 API 并设置超时 const response = await Promise.race([ - pushRouteBom(productionOrderNo), + pushRouteBom(productionOrderNo, this.routeGroupName.trim()), timeoutPromise ]); // 处理后端返回的数据 - 适配新的返回结构 R const {duplicateRoutes, failedRoutes, successfulRoutes} = response.data; // 提取物料编码和错误信息 const duplicateCodes = duplicateRoutes.join(', '); - const failedInfo = failedRoutes.map(route => + const failedInfo = failedRoutes.map(route => `${route.materialCode} (${route.errorMessage || '未知错误'})` ).join(', '); const successfulCodes = successfulRoutes.map(route => route.materialCode).join(', '); @@ -1607,7 +1622,7 @@ export default { const rooteProdet = this.params.productionOrderNo; //获取物料编码 const materialCode = this.params.materialCode; - + console.log(rooteProdet); // 调用封装好的 API 方法（带勾选的 ids） diff --git a/src/views/system/spec35r/index.vue b/src/views/system/spec35r/index.vue new file mode 100644 index 0000000..1ca2190 --- /dev/null +++ b/src/views/system/spec35r/index.vue @@ -0,0 +1,486 @@ + + +