Compare commits
No commits in common. "89ebffaf865230c66f0e64abe8948311e9cd2d9b" and "852fda1ac2cc8b943f04cdfcfe39be53b05e6637" have entirely different histories.
89ebffaf86
...
852fda1ac2
@ -17,11 +17,12 @@ export function getDetails(id) {
|
||||
})
|
||||
}
|
||||
|
||||
export function updateFBl(data) {
|
||||
export function updateFBl(fnumber) {
|
||||
console.log('111',fnumber)
|
||||
return request({
|
||||
url: '/system/details/updateFBMaterial',
|
||||
method: 'post',
|
||||
data: data
|
||||
data: fnumber
|
||||
})
|
||||
}
|
||||
// 获取项目令号列表
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
export function indexUrl() {
|
||||
return request({
|
||||
url: '/system/jeecg/getReport',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@ -114,58 +114,3 @@ export function generatePDFs(rooteProdet) {
|
||||
});
|
||||
}
|
||||
|
||||
// 获取物料BOM信息,后端返回物料BOM信息集合
|
||||
export function getBomInfo(materialCode, materialName, productionOrderNo) {
|
||||
return request({
|
||||
url: '/system/route/getBomInfo',
|
||||
method: 'post',
|
||||
params: {
|
||||
materialCode,
|
||||
materialName,
|
||||
productionOrderNo // 添加生产订单号参数
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 新增BOM
|
||||
export function addBom(data) {
|
||||
return request({
|
||||
url: '/system/bom',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改BOM
|
||||
export function updateBom(data) {
|
||||
return request({
|
||||
url: '/system/bom',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除BOM
|
||||
export function deleteBom(id) {
|
||||
return request({
|
||||
url: '/system/bom/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 搜索物料
|
||||
export function searchMaterial(params) {
|
||||
return request({
|
||||
url: '/system/material/search',
|
||||
method: 'get',
|
||||
params: params
|
||||
})
|
||||
}
|
||||
// 查询物料列表
|
||||
export function listMaterial(query) {
|
||||
return request({
|
||||
url: '/system/material/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
@ -18,7 +18,7 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="父级图号" prop="fnumber">
|
||||
<el-form-item label="父级图号" prop="partNumber">
|
||||
<el-input
|
||||
v-model="queryParams.fnumber"
|
||||
placeholder="请输入图号"
|
||||
@ -456,30 +456,26 @@ export default {
|
||||
this.open = true;
|
||||
this.title = "添加bom明细";
|
||||
},
|
||||
/** 上传bom */
|
||||
updateFBMaterial(row) {
|
||||
this.loading = true;
|
||||
this.reset();
|
||||
|
||||
// 获取选中行的数据
|
||||
const selectedData = this.ids.map(id => {
|
||||
const item = this.detailsList.find(row => row.id === id);
|
||||
return {
|
||||
fnumber: item.fnumber, // 物料编码
|
||||
totalWeight: item.totalWeight // 生产令号
|
||||
};
|
||||
});
|
||||
|
||||
console.log('发送数据:', selectedData);
|
||||
|
||||
// 调用接口
|
||||
updateFBl(selectedData).then(response => {
|
||||
const fnumbers =this.fnumbers
|
||||
console.log(fnumbers)
|
||||
updateFBl(fnumbers).then(response => {
|
||||
this.form = response;
|
||||
const successCount = response.length;
|
||||
const fnumberCount = response.reduce((countMap, item) => {
|
||||
countMap[item.fnumber] = (countMap[item.fnumber] || 0) + 1;
|
||||
return countMap;
|
||||
}, {});
|
||||
// 获取成功的 fnumber 数量
|
||||
const successCount = Object.keys(fnumberCount).length;
|
||||
//彈窗
|
||||
this.resNotice(successCount);
|
||||
}).finally(() => {
|
||||
}).finally(()=>{
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
},
|
||||
/** 弹窗 **/
|
||||
resNotice(successCount) {
|
||||
this.$alert(`成功上传的条数:${successCount}`, '成功信息', {
|
||||
|
||||
@ -136,14 +136,14 @@
|
||||
icon="el-icon-folder-opened"
|
||||
@click="handleDetail(scope.row.productionOrderNo)"
|
||||
v-hasPermi="['system:orderPro:view']"
|
||||
>查看工艺</el-button>
|
||||
>查看详情</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-folder-opened"
|
||||
@click="handleBOM(scope.row.productionOrderNo)"
|
||||
v-hasPermi="['system:orderPro:view']"
|
||||
>查看BOM</el-button>
|
||||
>查看bom</el-button>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user