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 09:59:11 +08:00
parent 82b626db44
commit a4bfed1ad2
12 changed files with 231 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/deliverorder/DeliverOrderController.java
View File

@ -2,8 +2,10 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder;
import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
import com.chanko.yunxi.mes.framework.operatelog.core.service.OperateLogFrameworkService;
import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderCostRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
import org.springframework.transaction.annotation.Transactional;
@ -178,4 +180,12 @@ public class DeliverOrderController {
return success(deliverOrderService.getDeliverOrderSubListByDeliveryOrderId(deliveryOrderId));
}
@GetMapping("/getListYf")
@Operation(summary = "获得运费成本")
@PreAuthorize("@ss.hasPermission('heli:deliver-order:query')")
public CommonResult<List<DeliverOrderDO>> getListYf(@RequestParam("id") Long id, @RequestParam("projectSubId") Long projectSubId ) {
List<DeliverOrderDO> deliverOrderDO = deliverOrderService.getListYf(id,projectSubId);
return success( deliverOrderDO);
}
}

14
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java
View File

@ -10,12 +10,14 @@ import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
import com.chanko.yunxi.mes.framework.operatelog.core.service.OperateLogFrameworkService;
import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
import com.chanko.yunxi.mes.module.heli.dal.mysql.orderys.OrderYsMapper;
import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
import com.chanko.yunxi.mes.module.heli.manager.CrossOrderManager;
import com.chanko.yunxi.mes.module.heli.service.deliverorder.DeliverOrderService;
import com.chanko.yunxi.mes.module.heli.service.orderys.OrderYsService;
import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService;
import io.swagger.v3.oas.annotations.Operation;
@ -31,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@ -56,6 +59,8 @@ public class ProjectOrderController {
private CrossOrderManager crossOrderManager;
@Resource
private OrderYsService orderYsService;
@Resource
private DeliverOrderService deliverOrderService;
@PostMapping("/create")
@Operation(summary = "创建项目订单")
@PreAuthorize("@ss.hasPermission('heli:project-order:create')")
@ -137,6 +142,15 @@ public class ProjectOrderController {
@PreAuthorize("@ss.hasPermission('heli:project-order:query')")
public CommonResult<PageResult<ProjectOrderCostRespVO>> getProjectOrderCostPage(@Valid ProjectOrderCostPageReqVO pageReqVO) {
PageResult<ProjectOrderDO> pageResult = projectOrderService.getProjectOrderCostPage(pageReqVO);
for (ProjectOrderDO projectOrderDO :pageResult.getList()) {
List<DeliverOrderDO> deliverOrderDO = deliverOrderService.getListYf(projectOrderDO.getId(),projectOrderDO.getProjectSubId());
if (deliverOrderDO!=null&&deliverOrderDO.size()>0){
BigDecimal totalAmount = deliverOrderDO.stream()
.map(deliverOrderSubDO -> deliverOrderSubDO.getYunFeiMoney() != null ? deliverOrderSubDO.getYunFeiMoney() : BigDecimal.ZERO)
.reduce(BigDecimal.ZERO, BigDecimal::add);
projectOrderDO.setYunFeiCost(totalAmount);
}
}
return success(BeanUtils.toBean(pageResult, ProjectOrderCostRespVO.class));
}

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderCostRespVO.java
View File

@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
import io.swagger.v3.oas.annotations.media.Schema;
@ -61,7 +62,9 @@ public class ProjectOrderCostRespVO {
@Schema(description = "加工工时换算成本")
@ExcelProperty("加工工时换算成本")
private BigDecimal jiaGongShiCost;
@Schema(description = "运费成本")
@ExcelProperty("运费成本")
private BigDecimal yunFeiCost;
@Schema(description = "合计成本")
@ExcelProperty("合计成本")
private BigDecimal sumCost;

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/deliverorder/DeliverOrderDO.java
View File

@ -115,7 +115,8 @@ public class DeliverOrderDO extends BaseDO {
@TableField(exist = false)
private String saleOrderCode;
@TableField(exist = false)
private BigDecimal yunFeiMoney ;
@TableField(exist = false)
private String contractNo;

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
View File

@ -276,6 +276,11 @@ public class ProjectOrderDO extends BaseDO {
@TableField(exist = false)
private String unitName;
/*
* 运费成本
* */
@TableField(exist = false)
private BigDecimal yunFeiCost;
/**
* 变更的字段列表
* */

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java
View File

@ -44,7 +44,6 @@ public interface MaterialPlanDetailMapper extends BaseMapperX<MaterialPlanDetail
query.eq(reqVO.getMatCode()!=null,MaterialDO::getCode, reqVO.getMatCode());
query.eq(reqVO.getMatName()!=null,MaterialDO::getName, reqVO.getMatName());
query.eq(reqVO.getMatType()!=null,MaterialDO::getMaterialType, reqVO.getMatType());
return selectPage(reqVO, query);
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java
View File

@ -49,6 +49,7 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
.like(!StringUtils.isEmpty(reqVO.getCustomerName()),"b.name",reqVO.getCustomerName())
.like(!StringUtils.isEmpty(reqVO.getProjectSubName()),"a.name",reqVO.getProjectSubName())
.eq(ProjectOrderDO::getOrderStatus,32)
.in(ProjectOrderDO::getIsSnapshot,0);
;
return selectPage(reqVO, query);
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderService.java
View File

@ -6,7 +6,6 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.deliverorder.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderSubDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
/**
@ -70,4 +69,7 @@ public interface DeliverOrderService {
List<StorageMatDO> operateProjectOrders(DeliverOrderSaveReqVO operateReqVO);
List<DeliverOrderDO> getListYf(Long id, Long projectSubId);
}

24
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java
View File

@ -336,6 +336,30 @@ public class DeliverOrderServiceImpl implements DeliverOrderService {
return storageMatDOS;
}
@Override
public List<DeliverOrderDO> getListYf(Long id, Long projectSubId) {
LambdaQueryWrapper<DeliverOrderDO> wrapper = new LambdaQueryWrapper<>();
wrapper.like(DeliverOrderDO::getSaleOrderIds,id);
wrapper.eq(DeliverOrderDO::getDeliverStatus,2);
wrapper.orderByDesc(DeliverOrderDO::getDeliverDate);
List<DeliverOrderDO> deliverOrderDOS = deliverOrderMapper.selectList(wrapper);
if (deliverOrderDOS!=null&&deliverOrderDOS.size()>0){
for (DeliverOrderDO deliverOrderDO : deliverOrderDOS) {
LambdaQueryWrapper<DeliverOrderSubDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DeliverOrderSubDO::getDeliveryOrderId,deliverOrderDO.getId());
queryWrapper.eq(DeliverOrderSubDO::getSaleOrderSubId,projectSubId);
List<DeliverOrderSubDO> deliverOrderSubDOS = deliverOrderSubMapper.selectList(queryWrapper);
BigDecimal totalAmount = deliverOrderSubDOS.stream()
.map(deliverOrderSubDO -> deliverOrderSubDO.getYunFei() != null ? deliverOrderSubDO.getYunFei() : BigDecimal.ZERO)
.reduce(BigDecimal.ZERO, BigDecimal::add);
deliverOrderDO.setYunFeiMoney(totalAmount);
}
return deliverOrderDOS;
}
return null;
}
private void createDeliverOrderSubList(Long deliveryOrderId, List<DeliverOrderSubDO> list) {
list.forEach(o -> o.setDeliveryOrderId(deliveryOrderId));

4
mes-ui/mes-ui-admin-vue3/src/api/heli/saleordercost/index.ts
View File

@ -23,3 +23,7 @@ export const getPlanCost = async (id: number,projectSubId: number) => {
return await request.get({ url: `/heli/project-order/getCost?id=`+id+`&projectSubId=`+projectSubId })
}
//查询运费成本
export const getListYf = async (id: number,projectSubId: number) => {
return await request.get({ url: `/heli/deliver-order/getListYf?id=`+id+`&projectSubId=`+projectSubId })
}

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

@ -9,16 +9,16 @@
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
</template>
<el-row>
<el-col :span="6">
<el-col :span="6">
<el-form-item label="项目编号" prop="code">
<el-input class="!w-265px" v-model="formData.code" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName">
<el-input class="!w-265px" v-model="formData.projectName" disabled />
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称" prop="customerName">
@ -30,81 +30,80 @@
<el-input class="!w-265px" v-model="formData.projectSubName" disabled />
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="标准件成本" prop="biaoZhunJianCost">
<el-input class="!w-265px" v-model="formData.biaoZhunJianCost" disabled />
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="原材料成本" prop="yuanCaiLiaoCost">
<el-input class="!w-265px" v-model="formData.yuanCaiLiaoCost" disabled />
</el-form-item>
<el-form-item label="其他成本" prop="yuanCaiLiaoCost">
<el-input class="!w-265px" v-model="formData.qiTaCost" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="副资材成本" prop="code">
<el-input class="!w-265px" v-model="formData.fuZiCaiCost" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="外协加工费用" prop="code">
<el-input class="!w-265px" v-model="formData.waiXieCost" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="副资材成本" prop="code">-->
<!-- <el-input class="!w-265px" v-model="formData.fuZiCaiCost" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="外协加工费用" prop="code">-->
<!-- <el-input class="!w-265px" v-model="formData.waiXieCost" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<el-col :span="6">
<el-form-item label="加工工时换算成本" prop="jiaGongShiCost">
<el-input class="!w-265px" v-model="formData.jiaGongShiCost" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="钳工工时换算成本" prop="qianGongShiCost">
<el-input class="!w-265px" v-model="formData.qianGongShiCost" disabled />
</el-form-item>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="钳工工时换算成本" prop="qianGongShiCost">-->
<!-- <el-input class="!w-265px" v-model="formData.qianGongShiCost" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="运费成本" prop="yunFeiCost">
<el-input class="!w-265px" v-model="formData.yunFeiCost" disabled />
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="合计成本" prop="sumCost">
<el-input class="!w-265px" v-model="formData.sumCost" disabled />
</el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="rem">
<el-input class="!w-1825px" v-model="formData.rem" />
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">标准件成本</span>
</template>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="materialCode" width="240px" />
<el-table-column label="物料名称" align="center" prop="materialName" width="240px"/>
<el-table-column label="物料类型" align="center" prop="materialType" width="240px"/>
<el-table-column label="规格型号" align="center" prop="materialSpec" />
<el-table-column label="领料数量" align="center" prop="amount" />
<el-table-column label="系统单位" align="center" prop="unit" />
@ -115,24 +114,24 @@
</template>
</el-table-column>
<el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />
</el-table>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">原材料成本</span>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">其他材料成本</span>
</template>
<el-table v-loading="loading" :data="listYcl" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="materialCode" width="240px" />
<el-table-column label="物料名称" align="center" prop="materialName" width="240px"/>
<el-table-column label="物料类型" align="center" prop="materialType" width="240px"/>
<el-table-column label="规格型号" align="center" prop="materialSpec" />
<el-table-column label="领料数量" align="center" prop="amount" />
<el-table-column label="系统单位" align="center" prop="unit" />
@ -143,60 +142,60 @@
</template>
</el-table-column>
<el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />
</el-table>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">副资材成本</span>
</template>
<el-table v-loading="loading" :data="listFzc" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="materialCode" width="240px" />
<el-table-column label="物料名称" align="center" prop="materialName" width="240px"/>
<el-table-column label="物料类型" align="center" prop="materialType" width="240px"/>
<el-table-column label="规格型号" align="center" prop="materialSpec" />
<el-table-column label="领料数量" align="center" prop="amount" />
<el-table-column label="系统单位" align="center" prop="unit" />
<el-table-column label="最新采购价（暂估）" align="center" prop="zanGuMoney" />
<el-table-column label="最新采购价（实际）" align="center" >
<template v-slot="scope">
<el-input v-model="scope.row.shiJiMoney" />
</template>
</el-table-column>
<el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />
</el-table>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">外协加工费用</span>
</template>
<el-table v-loading="loading" :data="listWx" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="materialSpec" />
<el-table-column label="采购数量" align="center" prop="amount" />
<el-table-column label="系统单位" align="center" prop="unit" />
<el-table-column label="最新采购价（暂估）" align="center" prop="zanGuMoney" />
<el-table-column label="最新采购价（实际）" align="center" >
<template v-slot="scope">
<el-input v-model="scope.row.shiJiMoney" />
</template>
</el-table-column>
<el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />
</el-table>
</el-card>
<!-- <el-card class="hl-card-info">-->
<!-- <template #header>-->
<!-- <div class="hl-card-info-icona"></div><span class="hl-card-info-text">副资材成本</span>-->
<!-- </template>-->
<!-- <el-table v-loading="loading" :data="listFzc" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">-->
<!-- <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="materialCode" width="240px" />-->
<!-- <el-table-column label="物料名称" align="center" prop="materialName" width="240px"/>-->
<!-- <el-table-column label="物料类型" align="center" prop="materialType" width="240px"/>-->
<!-- <el-table-column label="规格型号" align="center" prop="materialSpec" />-->
<!-- <el-table-column label="领料数量" align="center" prop="amount" />-->
<!-- <el-table-column label="系统单位" align="center" prop="unit" />-->
<!-- <el-table-column label="最新采购价（暂估）" align="center" prop="zanGuMoney" />-->
<!-- <el-table-column label="最新采购价（实际）" align="center" >-->
<!-- <template v-slot="scope">-->
<!-- <el-input v-model="scope.row.shiJiMoney" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />-->
<!-- </el-table>-->
<!-- </el-card>-->
<!-- <el-card class="hl-card-info">-->
<!-- <template #header>-->
<!-- <div class="hl-card-info-icona"></div><span class="hl-card-info-text">外协加工费用</span>-->
<!-- </template>-->
<!-- <el-table v-loading="loading" :data="listWx" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">-->
<!-- <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="materialSpec" />-->
<!-- <el-table-column label="采购数量" align="center" prop="amount" />-->
<!-- <el-table-column label="系统单位" align="center" prop="unit" />-->
<!-- <el-table-column label="最新采购价（暂估）" align="center" prop="zanGuMoney" />-->
<!-- <el-table-column label="最新采购价（实际）" align="center" >-->
<!-- <template v-slot="scope">-->
<!-- <el-input v-model="scope.row.shiJiMoney" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="采购金额(实际)" align="center" prop="caiGouMoney" />-->
<!-- </el-table>-->
<!-- </el-card>-->
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">加工工时换算成本</span>
</template>
</template>
<el-table v-loading="loading" :data="listJg" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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" />
@ -209,30 +208,30 @@
</template>
</el-table-column>
<el-table-column label="加工费用" align="center" prop="zanGuMoney" />
</el-table>
</el-card>
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">钳工工时换算成本</span>
</template>
<el-table v-loading="loading" :data="listQg" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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" />
<el-table-column label="总加工工时" align="center" prop="amount" />
<el-table-column label="工时单价" align="center" >
<template v-slot="scope">
<el-input v-model="scope.row.shiJiMoney" />
</template>
</el-table-column>
<el-table-column label="加工费用" align="center" prop="zanGuMoney" />
</el-table>
</el-card>
<!-- <el-card class="hl-card-info">-->
<!-- <template #header>-->
<!-- <div class="hl-card-info-icona"></div><span class="hl-card-info-text">钳工工时换算成本</span>-->
<!-- </template>-->
<!-- <el-table v-loading="loading" :data="listQg" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">-->
<!-- <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" />-->
<!-- <el-table-column label="总加工工时" align="center" prop="amount" />-->
<!-- <el-table-column label="工时单价" align="center" >-->
<!-- <template v-slot="scope">-->
<!-- <el-input v-model="scope.row.shiJiMoney" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="加工费用" align="center" prop="zanGuMoney" />-->
<!-- </el-table>-->
<!-- </el-card>-->
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">运费成本</span>
@ -240,11 +239,11 @@
<el-table v-loading="loading" :data="listYf" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="fhTime" width="240px"/>
<el-table-column label="发货时间" align="center" prop="deliverDate" width="240px" :formatter="dateFormatter2"/>
<el-table-column label="运费成本" align="center" prop="yunFeiMoney" />
</el-table>
</el-card>
</el-form>
@ -253,15 +252,14 @@
<el-button @click="submitForm" type="success" size="large">保 存</el-button>
</div>
</el-card>
</template>
<script setup lang="ts">
import { inject } from 'vue'
import { getIntDictOptions, getStrDictOptions, getDictLabel, DICT_TYPE } from '@/utils/dict'
import { betweenDay, formatDate, dateFormatter } from '@/utils/formatTime'
import { Search, Plus } from '@element-plus/icons-vue'
import * as SaleeOrderCost from '@/api/heli/saleordercost'
import {dateFormatter2} from "@/utils/formatTime";
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const { query } = useRoute()
@ -270,43 +268,51 @@
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const list = ref([]) // 标准件数据
const listYcl = ref([]) // 原材料
const listFzc = ref([]) // 副资材
const listWx = ref([]) // 外协
// const listFzc = ref([]) // 副资材
// const loading = ref(true) // 列表的加载中
// const listWx = ref([]) // 外协
const listJg = ref([]) // 加工
const listQg = ref([]) // 钳工
// const listQg = ref([]) // 钳工
const listYf = ref([]) // 运费
const formData = ref({
id:undefined,
code:undefined,
customerName:undefined,
projectSubName:undefined,
projectSubId:undefined,
projectName:undefined,
biaoZhunJianCost:undefined,
qiTaCost:undefined,
jiaGongShiCost:undefined,
yunFeiCost:undefined,
sumCost:undefined,
rem:undefined,
})
const submitForm = async () => {
}
//初始化方法
onMounted(async () => {
console.log("跳转传入的ID");
formData.value.id = query.id
formData.value.projectSubId = query.projectSubId
console.log(formData.value.id);
console.log(formData.value.projectSubId );
//查询子项目信息
const data = await SaleeOrderCost.getPlanCost(query.id,query.projectSubId)
formData.value = data
//查询标准件信息
//查询运费成本
const listYfData = await SaleeOrderCost.getListYf(query.id,query.projectSubId)
listYf.value=listYfData
formData.value.yunFeiCost=0
listYf.value.map((item)=>{
formData.value.yunFeiCost+=item.yunFeiMoney
})
})
</script>
<style>
@ -315,4 +321,4 @@
border: solid 1px orange;
outline: solid 1px orange;
}
</style>
</style>

23
mes-ui/mes-ui-admin-vue3/src/views/heli/saleordercost/index.vue
View File

@ -65,11 +65,11 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border class="hl-table">
<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="code" width="240px" />
<el-table-column label="项目名称" align="center" prop="projectName" width="240px"/>
@ -77,10 +77,11 @@
<el-table-column label="子项目Id" v-if="false" align="center" prop="projectSubId" />
<el-table-column label="子项目名称" align="center" prop="projectSubName" />
<el-table-column label="标准件成本" align="center" prop="biaoZhunJianCost" />
<el-table-column label="原材料成本" align="center" prop="yuanCaiLiaoCost" />
<el-table-column label="副资材成本" align="center" prop="fuZiCaiCost" />
<el-table-column label="外协加工费用" align="center" prop="waiXieCost" />
<el-table-column label="其他成本" align="center" prop="yuanCaiLiaoCost" />
<!-- <el-table-column label="副资材成本" align="center" prop="fuZiCaiCost" />-->
<!-- <el-table-column label="外协加工费用" align="center" prop="waiXieCost" />-->
<el-table-column label="加工工时换算成本" align="center" prop="jiaGongShiCost" />
<el-table-column label="运费成本" align="center" prop="yunFeiCost" />
<el-table-column label="合计成本" align="center" prop="sumCost" />
@ -91,7 +92,7 @@
<el-button link type="primary" @click="openForm(scope.row.id,scope.row.projectSubId)">
编辑
</el-button>
</el-col>
</el-row>
@ -110,14 +111,12 @@
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
</template>
<script setup lang="ts">
import download from '@/utils/download'
import * as SaleeOrderCost from '@/api/heli/saleordercost'
import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
import * as UserApi from '@/api/system/user'
defineOptions({ name: 'Shenhe' })
@ -138,7 +137,7 @@ const queryParams = reactive({
customerName: undefined,
projectSubName: undefined,
projectSubId:undefined,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
@ -154,7 +153,7 @@ const getList = async () => {
try {
const data = await SaleeOrderCost.getPlanBb(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
@ -200,4 +199,4 @@ onMounted(async () => {
await getList()
userList.value = await UserApi.getSimpleUserList()
})
</script>
</script>