From 2e9df0c3751c231f8b624c61f026a9c414cb66c1 Mon Sep 17 00:00:00 2001 From: wb_zhanghaoyuan Date: Fri, 27 Jun 2025 17:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialPlanBoomMapper.java | 4 +- .../src/views/heli/partpurchase/index.vue | 90 +++++++++++++++++-- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index b8664e3..7aa1aed 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -21,6 +21,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageMaterialDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.enums.BoomDetailTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum; @@ -198,7 +199,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(MaterialPlanBoomDO.class) .select("p.project_name as projectName","p.name as projectSubName") - .select("d.blueprint_no as blueprintNo","d.unit as unit") + .select("d.blueprint_no as blueprintNo","d.unit as unit","f.name as supplierName") .select("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName") .select(MaterialPlanDO::getBrief) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) @@ -206,6 +207,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) .leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId) .leftJoin(CompositionDO.class, "e", CompositionDO::getId, ProcessBomDetailDO::getCompositionId) + .leftJoin(SupplierDO.class, "f", SupplierDO::getId, MaterialPlanBoomDO::getSupplierId) .disableSubLogicDel(); query .like(!StringUtils.isEmpty(pageReqVO.getProjectName()),MaterialPlanDO::getProjectName, pageReqVO.getProjectName()) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue index 27ee3d7..59cc324 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue @@ -53,7 +53,7 @@ @@ -71,16 +71,70 @@ + + + + + + - + + + + + + + + + + + + + + + + + + + + + @@ -110,6 +164,7 @@ import {ElTable} from "element-plus"; import {useUserStore} from "@/store/modules/user"; import {dateFormatter1} from "@/utils/formatTime"; import {getPartPurchasePages} from "@/api/heli/materialplan"; +import SupplierSelect from "@/views/heli/hlvuestyle/supplierSelect.vue"; const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 defineOptions({ name: 'standard' }) @@ -184,9 +239,14 @@ const handleQuery = () => { queryParams.pageNo = 1 getList() } +// //接收供应商传递的数据 +// const handleSelectedSupplier = (newValue: any) => { +// formData.value.supplierId = newValue?.id +// } const handleSelectedUser = (currentIndex, newValue: any) => { - list.value[currentIndex].duEmpId = newValue?.id + list.value[currentIndex].supplierId = newValue?.id } + const singleSubmission= (val) =>{ multipleTable.value=[] multipleTable.value.push(val) @@ -211,6 +271,26 @@ const submitForm = async () => { return; } + for (let i = 0; i < list.length; i++) { + if (list[i].purchaseAmount === null || list[i].purchaseAmount === 0) { + message.error("采购数量为0或空"); + break; + } + if (list[i].supplierId === null) { + message.error("供应商为空"); + break; + } + if (list[i].arriveTime === null) { + message.error("预计到货日期为空"); + break; + } + if (list[i].estimatedPrice === null) { + message.error("预估总价为空"); + break; + } + + } + // 2. 检查供应商一致性 const firstSupplierId = list[0].supplierId; if (list.some(item => item.supplierId !== firstSupplierId)) {