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

零件采购订单生成fix

Browse Source
This commit is contained in:
wb_zhanghaoyuan 2025-06-23 17:57:11 +08:00
parent 1595733b09
commit c8086d22ef
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -142,4 +143,8 @@ public class PartPurchaseOrderPageRespVO extends BaseDO {
* 责任人名称
*/
private String duEmpName;
/**
* 工序名称
*/
private String procedureName;
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
View File

@ -66,10 +66,12 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
query.selectAll(PurchaseOrderMakeDetailDO.class)
.select("c.nickname as duEmpName")
.select("d.name as supplierName")
.select("e.name as procedureName")
.leftJoin(PurchaseOrderMakeDO.class,"a",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)
.leftJoin(ProjectOrderDO.class,"b",ProjectOrderDO::getId,PurchaseOrderMakeDO::getProjectId)
.leftJoin(AdminUserDO.class,"c", AdminUserDO::getId,PurchaseOrderMakeDetailDO::getDuEmpId)
.leftJoin(SupplierDO.class, "d", SupplierDO::getId,PurchaseOrderMakeDetailDO::getSupplierId)
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, PurchaseOrderMakeDetailDO::getProcedureId)
.disableLogicDel()
.disableSubLogicDel()
.eq(PurchaseOrderMakeDO::getGoodsType, 2)

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java
View File

@ -63,7 +63,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{
purchaseOrderNoDO.setGoodsType(2);
purchaseOrderNoDO.setSupplierId(detailDO.getSupplierId());
purchaseOrderNoDO.setOrdDate(LocalDate.now());
long purchaseOrderId = purchaseOrderNoMapper.insert(purchaseOrderNoDO);
purchaseOrderNoMapper.insert(purchaseOrderNoDO);
long purchaseOrderId = purchaseOrderNoDO.getId();
// PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = new PurchaseOrderNoDetailDO();
// purchaseOrderNoDetailDO.setPurchaseOrderId(purchaseOrderId);
@ -75,7 +76,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{
purchaseOrderNoDetailDO.setId(null);
purchaseOrderNoDetailDO.setPurchaseOrderId(purchaseOrderId);
purchaseOrderNoDetailDO.setPurchaseRemAmount(detailDO.getPurchaseAmount());
long purchaseOrderDetailId = purchaseOrderNoDetailMapper.insert(purchaseOrderNoDetailDO);
purchaseOrderNoDetailMapper.insert(purchaseOrderNoDetailDO);
long purchaseOrderDetailId = purchaseOrderNoDetailDO.getId();
PurchaseOrderMakeDetailDO purchaseOrderMakeDetailDO = new PurchaseOrderMakeDetailDO();
purchaseOrderMakeDetailDO.setId(detailDO.getId());

16
mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue
View File

@ -53,6 +53,7 @@
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">采购单明细</span>
<el-button style="margin-left: 18px" @click="singleSubmissions()" type="success" size="large">订单生成</el-button>
</template>
<el-row>
<el-col>
@ -62,10 +63,11 @@
<el-table-column type="selection" width="55" />
<el-table-column fixed label="序号" align="center" type="index" width="60" />
<el-table-column label="子项目编码" align="center" prop="projectSubCode" min-width="180" />
<el-table-column label="工序" align="center" prop="procedureName" min-width="100" />
<el-table-column label="零件名称" align="center" prop="boomName" min-width="180" />
<el-table-column label="材质" align="center" prop="composition" min-width="120" />
<el-table-column label="采购数量" align="center" prop="purchaseAmount" min-width="120" />
<el-table-column label="计划到货日期" align="center" prop="arriveTime" min-width="120" />
<el-table-column label="计划到货日期" align="center" prop="arriveTime" :formatter="dateFormatter1" min-width="120" />
<el-table-column label="供应商" align="center" prop="supplierName" min-width="180" />
<el-table-column label="技术要求" align="center" prop="description" min-width="180" />
<el-table-column label="理论重量" align="center" prop="theWeight" min-width="100" />
@ -81,9 +83,6 @@
</el-col>
</el-row>
</el-card>
<div class="hl-footer text-center">
<el-button style="margin-left: 18px" @click="singleSubmissions()" type="success" size="large">订单生成</el-button>
</div>
</el-card>
</template>
@ -96,9 +95,13 @@ import {inject, ref} from "vue";
import * as MaterialPlanApi from "@/api/heli/materialplan";
import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder";
import {ElTable} from "element-plus";
import {useUserStore} from "@/store/modules/user";
import {dateFormatter1} from "@/utils/formatTime";
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
defineOptions({ name: 'standard' })
const userStore = useUserStore()
const username = userStore.getUser.nickname
const reload: any = inject('reload')
const commonStore = useCommonStateWithOut()
const message = useMessage() // 消息弹窗
@ -122,9 +125,9 @@ const queryParams = reactive({
version: undefined,
bomStatus: undefined,
remark: undefined,
status: 0,
status: 1,
createTime: [],
ownerName:undefined,
ownerName:username,
materialName:undefined,
projectMaterialPlanNo:undefined,
supplierName:undefined,
@ -227,6 +230,7 @@ const submitForm = async () => {
]);
message.success("提交成功");
router.push({ path: '/purchase/purchaseorderno'})
getList(); // 确保刷新完成
emit('success');