From 1a14def1db993cf34100d74fddc3e7568db106f1 Mon Sep 17 00:00:00 2001 From: wb_zhanghaoyuan Date: Thu, 26 Jun 2025 20:38:25 +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 --- .../materialplan/MaterialPlanController.java | 14 ++++ .../vo/MaterialPlanPageReqVO.java | 6 ++ .../materialplanboom/MaterialPlanBoomDO.java | 11 +++ .../MaterialPlanBoomMapper.java | 29 ++++++++ .../materialplan/MaterialPlanService.java | 2 + .../materialplan/MaterialPlanServiceImpl.java | 5 ++ .../src/api/heli/materialplan/index.ts | 10 +++ .../src/views/heli/partpurchase/index.vue | 68 ++++++------------- 8 files changed, 99 insertions(+), 46 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java index 34557a0..ae2b3c7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/MaterialPlanController.java @@ -199,4 +199,18 @@ public class MaterialPlanController { public CommonResult delMaterial(@RequestParam("id") Long id) { return materialPlanService.delMaterial(id); } + +// @PostMapping("/getPartPurchasePages") +// @Operation(summary = "获得零件采购分页") +// public CommonResult> getPartPurchasePages(@Valid @RequestBody MaterialPlanPageReqVO pageReqVO) { +// PageResult pageResult = materialPlanService.getPartPurchasePages(pageReqVO); +// return success(pageResult); +// } + + @GetMapping("/getPartPurchasePages") + @Operation(summary = "获得零件采购分页") + public CommonResult> getPartPurchasePages() { + String a ="asdij"; + return null; + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java index 748e764..6b6f6cb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanPageReqVO.java @@ -69,5 +69,11 @@ public class MaterialPlanPageReqVO extends PageParam { @Schema(description = "制单日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] matPlanDate; + @Schema(description = "物料名称") + private String matName; + @Schema(description = "零件采购需求状态(0-待送审 1 -已送审 2-已批准 3-已打回)") + private Integer mplanStatus; + @Schema(description = "责任人") + private String duEmpName; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java index 13b8ef1..72f0f05 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java @@ -162,4 +162,15 @@ public class MaterialPlanBoomDO extends BaseDO { private String customerBriefName; @TableField(exist = false) private String boomArriveDates; + + /** + * 单位 + */ + @TableField(exist = false) + private String unit; + /** + * 责任人姓名 + */ + @TableField(exist = false) + private String duEmpName; } 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 f7ba7ea..6d61bde 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 @@ -192,6 +192,35 @@ public interface MaterialPlanBoomMapper extends BaseMapperX return selectPage(pageReqVO, query); } + + default PageResult getPartsPages(MaterialPlanPageReqVO pageReqVO){ + 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("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName") + .select(MaterialPlanDO::getBrief) + .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) + .leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId) + .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId) + .leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId) + .leftJoin(CompositionDO.class, "e", CompositionDO::getId, ProcessBomDetailDO::getCompositionId) + .disableSubLogicDel(); + query + .like(!StringUtils.isEmpty(pageReqVO.getProjectName()),MaterialPlanDO::getProjectName, pageReqVO.getProjectName()) + .like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), MaterialPlanDO::getName, pageReqVO.getProjectSubName()) + .like(!StringUtils.isEmpty(pageReqVO.getMaterialName()), MaterialPlanBoomDO::getMatName, pageReqVO.getMaterialName()) + .like(!StringUtils.isEmpty(pageReqVO.getMatName()), MaterialPlanBoomDO::getMatName, pageReqVO.getMatName()) + .like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode()) + .like(!StringUtils.isEmpty(pageReqVO.getDuEmpName()), AdminUserDO::getNickname, pageReqVO.getDuEmpName()) + .eq(!StringUtils.isEmpty(pageReqVO.getMatType()), MaterialPlanDO::getMatType, pageReqVO.getMatType()) + .eq(!StringUtils.isEmpty(pageReqVO.getStatus()), MaterialPlanBoomDO::getIsPurYard, pageReqVO.getStatus()) + .eq(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus()) + .eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo()); + return selectPage(pageReqVO, query); + } + + // default PageResult selectPage(MaterialPlanBoomPageReqVO reqVO) { // return selectPage(reqVO, new LambdaQueryWrapperX() // .eqIfPresent(MaterialPlanBoomDO::getId, reqVO.getId()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java index 734b85d..a358f0a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanService.java @@ -80,4 +80,6 @@ public interface MaterialPlanService { Boolean supplement(List list); CommonResult delMaterial(Long id); + + PageResult getPartPurchasePages(MaterialPlanPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index ed7e0cb..35a46ad 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -425,4 +425,9 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { return null; } + @Override + public PageResult getPartPurchasePages(MaterialPlanPageReqVO pageReqVO) { + return materialPlanBoomMapper.getPartsPages(pageReqVO); + } + } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts index 4622a51..346afff 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/materialplan/index.ts @@ -94,3 +94,13 @@ export const supplement = async (data) => { export const delMaterial = async (id: number) => { return await request.delete({ url: `/heli/material-plan/delMaterial?id=` + id }) } + +// // 查询零件采购分页 +// export const getPartPurchasePages = async (params) => { +// return await request.post({ url: `/heli/material-plan/getPartPurchasePages`, params }) +// } + +// 更新采购单主驳回 +export const getPartPurchasePages = async () => { + return await request.get({ url: `/heli/material-plan/getPartPurchasePage` }) +} 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 6bf5c87..1c18273 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 @@ -12,17 +12,17 @@ - - + + - - + + - - + + @@ -71,25 +71,14 @@ - - - - - - - - - - - - - + + + + + + + + @@ -112,6 +101,7 @@ import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; import {ElTable} from "element-plus"; import {useUserStore} from "@/store/modules/user"; import {dateFormatter1} from "@/utils/formatTime"; +import {getPartPurchasePages} from "@/api/heli/materialplan"; const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 defineOptions({ name: 'standard' }) @@ -140,10 +130,11 @@ const queryParams = reactive({ version: undefined, bomStatus: undefined, remark: undefined, - status: 1, + mplanStatus: 0, createTime: [], - ownerName:username, + duEmpName:username, materialName:undefined, + matName:undefined, projectMaterialPlanNo:undefined, }) const queryFormRef = ref() // 搜索的表单 @@ -153,9 +144,10 @@ const exportLoading = ref(false) // 导出的加载中 const getList = async () => { loading.value = true try { - const data = await PartPurchaseOrderApi.getPartPage(queryParams) - list.value = data.list - total.value = data.total + // const data = await MaterialPlanApi.getPartPurchasePages(queryParams) + // list.value = data.list + // total.value = data.total + await MaterialPlanApi.getPartPurchasePages() } finally { loading.value = false } @@ -219,22 +211,6 @@ const submitForm = async () => { return; } - // // 3. 校验每个零件 - // for (const item of list) { - // if (item.projectMaterialPlanNo) { - // message.error(`工序${item.procedureName}中零件 ${item.materialName} 已生成物料需求计划,请确认`); - // return; - // } - // if (!item.boomArriveDate) { // 注意：原代码是 boomArriveDate，确保拼写正确 - // message.error(`工序${item.procedureName}中零件 ${item.materialName} 要求完成日期为空,请确认`); - // return; - // } - // if (!item.duEmpId) { - // message.error(`工序${item.procedureName}中零件 ${item.materialName} 责任人为空,请确认`); - // return; - // } - // } - // 4. 添加加载状态（Element Plus 兼容处理） formLoading.value = true;