From 775f03825af93fd6d583676cd9c8027a95cc6ab0 Mon Sep 17 00:00:00 2001
From: wb_zhanghaoyuan <wb_zhanghaoyuan@meituan.com>
Date: Fri, 27 Jun 2025 14:16:15 +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

---
 .../materialplanboom/MaterialPlanBoomDO.java         |  5 +++++
 .../materialplanboom/MaterialPlanBoomMapper.java     |  7 +++++--
 .../src/views/heli/partpurchase/index.vue            | 12 ++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

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 dc79f14..2d25961 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
@@ -172,4 +172,9 @@ public class MaterialPlanBoomDO extends BaseDO {
      */
     @TableField(exist = false)
     private String duEmpName;
+    /**
+     * 客户简称
+     */
+    @TableField(exist = false)
+    private String brief;
 }
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 ae708b8..b8664e3 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
@@ -26,6 +26,7 @@ import com.chanko.yunxi.mes.module.heli.enums.BoomDetailTypeEnum;
 import com.chanko.yunxi.mes.module.heli.enums.ProcessBomStatusEnum;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.google.common.collect.Lists;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.materialplanboom.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -215,9 +216,11 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
                 .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())
+                .in(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus() != 0 ? Arrays.asList(pageReqVO.getMplanStatus()) : Arrays.asList(0, 3))
                 .eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo());
-        return selectPage(pageReqVO, query);
+
+        PageResult<MaterialPlanBoomDO> pageResult = selectPage(pageReqVO, query);
+        return pageResult;
     }
 
 
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 56e1c55..27ee3d7 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
@@ -69,13 +69,21 @@
                     </el-button>
                   </template>
                 </el-table-column>
-                <el-table-column label="客户简称" align="center" prop="brief" min-width="180" />
+                <el-table-column label="客户简称" align="center" prop="customerBriefName" min-width="180" />
                 <el-table-column label="项目名称" align="center" prop="projectName" min-width="180" />
                 <el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
                 <el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
                 <el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
                 <el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
-                <el-table-column label="单位" align="center" prop="unit" min-width="120" />
+                <el-table-column label="采购数量" align="center" prop="unit" min-width="120" />
+                <el-table-column min-width="200px" align="center">
+                  <template #header>采购数量</template>
+                  <template #default="{ row, $index }">
+                    <el-form-item :prop="`${$index}.matWeight`" class="mb-0px!" >
+                      <el-input-number v-model="row.matWeight" type="number" :precision="0"  />
+                    </el-form-item>
+                  </template>
+                </el-table-column>
                 <el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />
                 <el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" />
                 <el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="120" />