licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加工成本添加报工人和岗位

Browse Source
This commit is contained in:
z 2025-03-04 18:57:09 +08:00
parent 1fe97a35c2
commit 15d7c63608
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
View File

@ -161,12 +161,13 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
MPJLambdaWrapper<TaskDispatchDO> query = new MPJLambdaWrapper<>();
query.selectAll(TaskDispatchDO.class)
.select("z.name as materialName", "z.procedure_type as materialType", "SUM(COALESCE(d.work_time, 0)) as amount")
.select("p.grade_cost as shiJiMoney")
.select("p.grade_cost as shiJiMoney","u1.nickname as ownerName","p.name as name")
.select(" ROUND(SUM(COALESCE(d.work_time, 0)) * p.grade_cost, 2) as zanGuMoney")
.leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getDispatchId,TaskDispatchDO::getId)
.leftJoin(ProcedureDO.class, "z", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
.leftJoin(TaskReportDO.class, "d", TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId)
.leftJoin(UserPostDO.class, "c", UserPostDO::getUserId, TaskReportDO::getOwner)
.leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, TaskReportDO::getOwner)
.leftJoin(PostDO.class,"p", PostDO::getId,UserPostDO::getPostId)
.groupBy(TaskDispatchDetailDO::getId)
.orderByDesc(TaskDispatchDO::getCreateTime)

12
mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/edit.vue
View File

@ -200,12 +200,14 @@
<el-table-column type="index" min-width="60" fixed label="序号" align="center" />
<el-table-column v-if="false" label="ID" align="center" prop="id" width="240px" />
<el-table-column label="工序名称" align="center" prop="materialName" width="240px"/>
<el-table-column label="工序类型" align="center" prop="materialType" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_PROCEDURE_TYPE" :value="scope.row.materialType" />
</template>
</el-table-column>
<el-table-column label="报工人" align="center" prop="ownerName" width="240px"/>
<!-- <el-table-column label="工序类型" align="center" prop="materialType" >-->
<!-- <template #default="scope">-->
<!-- <dict-tag :type="DICT_TYPE.HELI_PROCEDURE_TYPE" :value="scope.row.materialType" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="总加工工时" align="center" prop="amount" />
<el-table-column label="所属岗位" align="center" prop="name" />
<el-table-column label="工时单价" align="center" prop="shiJiMoney"/>
<el-table-column label="加工费用" align="center" prop="zanGuMoney" />