diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailPageReqVO.java
index cbd4794b..960113f2 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailPageReqVO.java
@@ -1,6 +1,8 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo;
 
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
@@ -28,7 +30,7 @@ public class MaterialPlanDetailPageReqVO extends PageParam {
     private Long projectSubId;
 
     @Schema(description = "需求数量")
-    private Long requireAmount;
+    private BigDecimal requireAmount;
 
     @Schema(description = "需求到货日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailRespVO.java
index a95fcb32..03c1bb86 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailRespVO.java
@@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -31,7 +33,7 @@ public class MaterialPlanDetailRespVO {
 
     @Schema(description = "需求数量")
     @ExcelProperty("需求数量")
-    private Long requireAmount;
+    private BigDecimal requireAmount;
 
     @Schema(description = "需求到货日期")
     @ExcelProperty("需求到货日期")
@@ -45,4 +47,28 @@ public class MaterialPlanDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "物料id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("物料id")
+    private Long matId;
+
+    @Schema(description = "备注")
+    @ExcelProperty("物料名称")
+    private String matName;
+
+    @Schema(description = "备注")
+    @ExcelProperty("物料编码")
+    private String matCode;
+
+    @Schema(description = "备注")
+    @ExcelProperty("物料规格型号")
+    private String matSpec;
+
+    @Schema(description = "备注")
+    @ExcelProperty("物料单位")
+    private String matUnit;
+
+    @Schema(description = "备注")
+    @ExcelProperty("物料类型")
+    private String matType;
+
 }
\ 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/controller/admin/materialplandetail/vo/MaterialPlanDetailSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailSaveReqVO.java
index 53459f82..2579ec54 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplandetail/vo/MaterialPlanDetailSaveReqVO.java
@@ -1,38 +1,40 @@
-package com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 物料需求计划物料详情新增/修改 Request VO")
-@Data
-public class MaterialPlanDetailSaveReqVO {
-
-    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long id;
-
-    @Schema(description = "物料需求采购计划id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物料需求采购计划id不能为空")
-    private Long projectMaterialPlanId;
-
-    @Schema(description = "物料id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物料id不能为空")
-    private Long materialId;
-
-    @Schema(description = "子项目编号")
-    private Long projectSubId;
-
-    @Schema(description = "需求数量")
-    private Long requireAmount;
-
-    @Schema(description = "需求到货日期")
-    private LocalDateTime requireArriveTime;
-
-    @Schema(description = "备注")
-    private String description;
-
-}
\ No newline at end of file
+package com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 物料需求计划物料详情新增/修改 Request VO")
+@Data
+public class MaterialPlanDetailSaveReqVO {
+
+    @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "物料需求采购计划id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物料需求采购计划id不能为空")
+    private Long projectMaterialPlanId;
+
+    @Schema(description = "物料id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物料id不能为空")
+    private Long materialId;
+
+    @Schema(description = "子项目编号")
+    private Long projectSubId;
+
+    @Schema(description = "需求数量")
+    private BigDecimal requireAmount;
+
+    @Schema(description = "需求到货日期")
+    private LocalDateTime requireArriveTime;
+
+    @Schema(description = "备注")
+    private String description;
+
+}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java
index 008ce135..ec4a9050 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java
@@ -1,6 +1,8 @@
 package com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail;
 
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -43,7 +45,7 @@ public class MaterialPlanDetailDO extends BaseDO {
     /**
      * 需求数量
      */
-    private Long requireAmount;
+    private BigDecimal requireAmount;
     /**
      * 需求到货日期
      */
@@ -53,4 +55,17 @@ public class MaterialPlanDetailDO extends BaseDO {
      */
     private String description;
 
+    @TableField(exist = false)
+    private Long matId;
+    @TableField(exist = false)
+    private String matName;
+    @TableField(exist = false)
+    private String matCode;
+    @TableField(exist = false)
+    private String matSpec;
+    @TableField(exist = false)
+    private String matUnit;
+    @TableField(exist = false)
+    private String matType;
+
 }
\ 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/mysql/materialplandetail/MaterialPlanDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java
index a66c374d..2dced6a3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplandetail/MaterialPlanDetailMapper.java
@@ -5,9 +5,16 @@ import java.util.*;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
+import com.chanko.yunxi.mes.module.heli.controller.admin.materialplan.vo.MaterialPlanPageReqVO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplandetail.MaterialPlanDetailDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo.*;
+import org.springframework.util.StringUtils;
 
 /**
  * 物料需求计划物料详情 Mapper
@@ -18,16 +25,28 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.materialplandetail.vo.*
 public interface MaterialPlanDetailMapper extends BaseMapperX<MaterialPlanDetailDO> {
 
     default PageResult<MaterialPlanDetailDO> selectPage(MaterialPlanDetailPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MaterialPlanDetailDO>()
-                .eqIfPresent(MaterialPlanDetailDO::getId, reqVO.getId())
-                .eqIfPresent(MaterialPlanDetailDO::getProjectMaterialPlanId, reqVO.getProjectMaterialPlanId())
-                .eqIfPresent(MaterialPlanDetailDO::getMaterialId, reqVO.getMaterialId())
-                .eqIfPresent(MaterialPlanDetailDO::getProjectSubId, reqVO.getProjectSubId())
-                .eqIfPresent(MaterialPlanDetailDO::getRequireAmount, reqVO.getRequireAmount())
-                .betweenIfPresent(MaterialPlanDetailDO::getRequireArriveTime, reqVO.getRequireArriveTime())
-                .eqIfPresent(MaterialPlanDetailDO::getDescription, reqVO.getDescription())
-                .betweenIfPresent(MaterialPlanDetailDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(MaterialPlanDetailDO::getId));
+        MPJLambdaWrapper<MaterialPlanDetailDO> query = new MPJLambdaWrapper<>();
+
+        query.selectAll(MaterialPlanDetailDO.class)
+                .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType")
+                .leftJoin(MaterialDO.class, "mat", MaterialDO::getId, MaterialPlanDetailDO::getMaterialId)
+                .disableSubLogicDel()
+                .orderByDesc(MaterialPlanDetailDO::getCreateTime);
+        query.eq(reqVO.getProjectMaterialPlanId()!=null,MaterialPlanDetailDO::getProjectMaterialPlanId, reqVO.getProjectMaterialPlanId()).orderByAsc(MaterialPlanDetailDO::getCreateTime);
+
+        return selectPage(reqVO, query);
     }
+//    default PageResult<MaterialPlanDetailDO> selectPage(MaterialPlanDetailPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MaterialPlanDetailDO>()
+//                .eqIfPresent(MaterialPlanDetailDO::getId, reqVO.getId())
+//                .eqIfPresent(MaterialPlanDetailDO::getProjectMaterialPlanId, reqVO.getProjectMaterialPlanId())
+//                .eqIfPresent(MaterialPlanDetailDO::getMaterialId, reqVO.getMaterialId())
+//                .eqIfPresent(MaterialPlanDetailDO::getProjectSubId, reqVO.getProjectSubId())
+//                .eqIfPresent(MaterialPlanDetailDO::getRequireAmount, reqVO.getRequireAmount())
+//                .betweenIfPresent(MaterialPlanDetailDO::getRequireArriveTime, reqVO.getRequireArriveTime())
+//                .eqIfPresent(MaterialPlanDetailDO::getDescription, reqVO.getDescription())
+//                .betweenIfPresent(MaterialPlanDetailDO::getCreateTime, reqVO.getCreateTime())
+//                .orderByDesc(MaterialPlanDetailDO::getId));
+//    }
 
 }
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
new file mode 100644
index 00000000..0263385d
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
@@ -0,0 +1,566 @@
+<template>
+  <el-card class="hl-card" style="position: relative">
+    <template #header>
+      <span>编辑页</span>
+    </template>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
+      <!--  基础信息   -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+
+        <el-row>
+          <el-col :span="24">
+            <el-row>
+
+              <el-col :span="6">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="物料需求计划编号" prop="projectMaterialPlanNo">
+                      <el-input class="!w-265px" placeholder="系统自动生成" v-model="formData.projectMaterialPlanNo" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="80">
+                    <el-form-item label="备注" prop="description">
+                      <el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit
+                        maxlength="200" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+
+              <el-col :span="6">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="单据日期" prop="createTime">
+                      <el-date-picker class="!w-265px" v-model="formData.createTime" value-format="x" placeholder="单据日期"
+                        disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+
+              <el-col :span="6">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="生产计划单号" prop="planNo">
+                      <el-input class="!w-265px" placeholder="生产计划单号" v-model="formData.planNo" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目名称" prop="projectName">
+                      <el-input class="!w-265px" placeholder="项目名称" v-model="formData.projectName" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+
+              <el-col :span="6">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目编号" prop="projectCode">
+                      <el-input class="!w-265px" v-model="formData.projectCode" placeholder="项目编号" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="单据状态" prop="status">
+                      <el-select v-model="formData.status" placeholder="单据状态" clearable class="!w-265px" disabled>
+                        <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_STATUS)"
+                          :key="dict.value" :label="dict.label" :value="dict.value" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+
+            </el-row>
+          </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-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem">新增</el-button>
+              </el-col>
+              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
+                v-loading="subFormLoading" label-width="0">
+                <el-table :data="formData.matItemDOList" class="hl-table">
+                  <el-table-column type="index" label="序号" :width="80" />
+                  <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
+                  <el-table-column prop="matId" min-width="140" align="center">
+                    <template #header> <span class="hl-table_header">*</span>物料名称 </template>
+                    <template #default="scope">
+                      <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
+                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatNameSearch"
+                          remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
+                          @change="(val) => handleMatName(scope, val)" class="!w-180px">
+                          <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matType" label="物料类型" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType"
+                        v-if="scope.row.matType ? true : false" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+                  <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
+                    <template #default="scope">
+                      <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit"
+                        v-if="scope.row.matUnit ? true : false" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="requireAmount" min-width="120" align="center">
+                    <template #header><span class="hl-table_header">*</span>需求数量</template>
+                    <template #default="scope">
+                      <el-input v-model="scope.row.requireAmount" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>需求到货日期 </template>
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.requireArriveTime`" class="mb-0px!">
+                        <el-date-picker class="!w-265px" v-model="row.requireArriveTime" type="date" value-format="x"
+                          placeholder="需求到货日期" />
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column min-width="150" align="center">
+                    <template #header><span class="hl-table_header">*</span>子项目编号</template>
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.projectSubId`" class="mb-0px!">
+                        <el-select class="!w-265px" v-model="row.projectSubId" filterable>
+                          <el-option v-for="dict in formData.projectOrderSubs" :key="dict.projectSubId"
+                            :label="dict.projectSubCode" :value="dict.projectSubId" />
+                        </el-select>
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="description" min-width="180" label="备注" align="center">
+                    <template #default="scope">
+                      <el-input v-model="scope.row.description" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="240">
+                    <template #default="scope">
+                      <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)">
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form>
+            </el-card>
+          </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-row>
+          <el-col>
+            <el-card class="hl-incard">
+              <el-col>
+                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="uploadUrl"
+                  :headers="{
+                    Authorization: 'Bearer ' + getAccessToken(),
+                    'tenant-id': getTenantId()
+                  }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData"
+                  :on-change="matUploadChange" :on-error="UpError" class="upload-file-uploader">
+                  <el-button type="primary">
+                    <Icon icon="ep:upload-filled" />上传
+                  </el-button>
+                </el-upload>
+              </el-col>
+              <el-table :data="formData.attachments" class="hl-table">
+                <el-table-column prop="name" label="文件名称" align="center">
+                  <!-- <template #default="scope">
+                    <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
+                  </template> -->
+                </el-table-column>
+
+                <el-table-column prop="createTime" align="center" label="上传日期" :formatter="dateFormatter" />
+
+                <el-table-column label="操作" align="center">
+                  <template #default="scope">
+                    <el-button link type="danger" size="small"
+                      @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
+                      删除
+                    </el-button>
+                    <el-button link type="primary" size="small"
+                      @click="downloadAttachment(scope.row.name, scope.row.url)">
+                      下载
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-card>
+          </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-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="creator" label="创建人">
+              {{ userList.find((user) => user.id == formData.creator)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="createTime" label="创建时间">
+              {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="submitUserId" label="送审人">
+              {{ userList.find((user) => user.id == formData.submitUserId)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="submitTime" label="出库时间">
+              {{ formatDate(formData.submitTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row justify="center">
+          <el-col :span="8">
+            <el-form-item prop="auditor" label="审核人">
+              {{ userList.find((user) => user.id == formData.auditor)?.nickname }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="auditTime" label="审核时间">
+              {{ formatDate(formData.auditTime, 'YYYY-MM-DD HH:mm') }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+    </el-form>
+    <div class="text-center hl-footer">
+      <el-button @click="() => router.back()" size="large">取 消</el-button>
+      <el-button @click="deleteForm" type="danger" size="large">删 除</el-button>
+      <el-button @click="submitForm" type="primary" size="large">保 存</el-button>
+      <el-button @click="saveForm" type="success" size="large">送 审</el-button>
+    </div>
+  </el-card>
+  <ProjectPlanDialog ref="projectPlanDialog" @success="handleSelectedProjectPlan" />
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as MaterialPlanApi from '@/api/heli/materialplan'
+import * as MaterialPlanDetailApi from '@/api/heli/materialplandetail'
+import * as PlanApi from '@/api/heli/plan'
+import * as PlanSubApi from '@/api/heli/plansub'
+import * as ProjectOrderApi from '@/api/heli/projectorder'
+import * as UserApi from '@/api/system/user'
+import * as MaterialApi from '@/api/heli/material'
+import { deleteFile, downloadFile, getFilePage } from '@/api/infra/file'
+import download from '@/utils/download'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
+import ProjectPlanDialog from '@/views/heli/materialplan/ProjectPlanDialog.vue'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { query } = useRoute()
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  projectMaterialPlanNo: undefined,
+  projectId: undefined,
+  projectPlanId: undefined,
+  projectPlanNo: undefined,
+  projectCode: undefined,
+  auditor: undefined,
+  createTime: new Date(),
+  status: undefined,
+  description: undefined,
+  matItemDOList: [],
+  attachments: []
+})
+const formRules = reactive({
+  projectPlanId: [{ required: true, message: '生产计划单号不能为空', trigger: 'blur' }],
+})
+const subFormRules = reactive({
+  matCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
+  requireAmount: [{ required: true, message: '需求数量不能为空', trigger: 'blur' }],
+  requireArriveTime: [{ required: true, message: '需求到货日期不能为空', trigger: 'blur' }],
+  projectSubId: [{ required: true, message: '子项目编号不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+const subFormRef = ref() // 表单 Ref
+
+// ====================附件信息 开始=======================================
+const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
+const matUploadRef = ref()
+const matUploadFiles = ref<UploadUserFile[]>([])
+const matUploadData = ref({
+  businessType: 'MATERIALPLAN',
+  businessId: formData.value.id,
+  businessFileType: ''
+})
+const matUploadChange = (file, files) => {
+  matUploadFiles.value = files
+  refreshAttachments(files, 'MATERIALPLAN')
+}
+
+const failedAttachments = ref<UploadUserFile[]>([])
+const failedAttachmentsName = ref()
+const UpError = (err, file, fileList) => {
+  // 当有上传错误时
+  if (err) {
+    // 将失败的附件添加到failedAttachments.value数组中
+    failedAttachments.value.push(file)
+    failedAttachmentsName.value = failedAttachments.value.map((value) => value.name)
+  }
+}
+
+const openerror = () => {
+  setTimeout(() => {
+    if (failedAttachmentsName.value.length > 0) {
+      // 弹出错误信息提示框
+      ElMessageBox.alert(
+        // 使用错误信息作为提示内容
+        `文件名为：${failedAttachmentsName.value.join(' / ')}上传失败`,
+        `文件格式不正确或网络问题 请您稍后再试`,
+        {
+          dangerouslyUseHTMLString: false,
+          confirmButtonText: '知道了',
+          center: true
+        }
+      )
+    }
+  }, 1000)
+}
+
+const refreshAttachments = (files, type) => {
+  formData.value.attachments = formData.value.attachments.filter((value) => value.id)
+
+  // 避免重复添加
+  const newFiles = files.filter(
+    (file) => !formData.value.attachments.some((att) => att.name === file.name)
+  )
+
+  for (let i = 0; i < newFiles.length; i++) {
+    let file = newFiles[i]
+    file.businessFileType = type
+    file.createTime = new Date()
+    formData.value.attachments.push(file)
+  }
+
+  // 排序
+  formData.value.attachments.sort((v1, v2) => v1.createTime - v2.createTime)
+}
+
+// 删除附件
+const handleDeleteAttachment = async (index, type) => {
+  const deletedAttachments = formData.value.attachments.splice(index, 1)
+  for (let i = 0; i < deletedAttachments.length; i++) {
+    const attachment = deletedAttachments[i]
+    if (attachment.id) {
+      // 清理已上传文件
+      await deleteFile(attachment.id)
+    }
+    // 清理待上传文件
+    matUploadFiles.value = matUploadFiles.value.filter((file1) => {
+      return file1.name != attachment.name || file1.businessFileType != type
+    })
+  }
+}
+// 下载文件
+const downloadAttachment = async (name, url) => {
+  if (url) {
+    const data = await downloadFile(url)
+    download.any(data, name)
+  }
+}
+// ====================附件信息 结束=======================================
+
+
+// 远程数据筛选物料
+const getMatList = async (name) => {
+  // 获得物料列表
+  let matParams = {
+    pageNo: 1,
+    pageSize: 10,
+    status: '1'
+  }
+  if (name.length > 0) {
+    matParams.name = name
+  }
+  const dataMat = await MaterialApi.getMaterialPage(matParams)
+  matList.value = dataMat.list
+
+}
+const matList = ref<MaterialApi.MaterialVO[]>([]) // 物料列表
+const matSelectLoading = ref(false)
+const remoteMatNameSearch = async (name) => {
+  matSelectLoading.value = true
+  // 获得物料列表
+  await getMatList(name)
+  matSelectLoading.value = false
+}
+const handleMatName = async (scope, matid) => {
+  scope.row.matId = matList.value.find((item) => item.id === matid)?.id
+  scope.row.matName = matList.value.find((item) => item.id === matid)?.name
+  scope.row.matCode = matList.value.find((item) => item.id === matid)?.code
+  scope.row.matSpec = matList.value.find((item) => item.id === matid)?.spec
+  scope.row.matType = matList.value.find((item) => item.id === matid)?.materialType
+  scope.row.matUnit = matList.value.find((item) => item.id === matid)?.unit
+}
+
+//新增物料信息
+const onAddItem = () => {
+  const newData = {
+    // 新数据的属性
+    stockId: 0,
+    matId: '',
+    matName: '',
+    matCode: '',
+    matType: '',
+    matSpec: '',
+    matUnit: '',
+    requireAmount: '',
+    requireArriveTime: '',
+    projectSubId: '',
+    description: ''
+  }
+  formData.value.matItemDOList.push(newData)
+}
+//删除新增物料信息
+const handleDelete2 = (index: number) => {
+  formData.value.matItemDOList.splice(index, 1)
+}
+const handleInitPlanSub = async () => {
+  // 项目子项列表
+  formData.value.projectOrderSubs =
+    await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(formData.value.projectId)
+
+  // 生产计划子项列表
+  const queryParams = reactive({
+    pageNo: 1,
+    pageSize: 99,
+    projectPlanId: query.id
+  })
+
+  formData.value.projectPlanSubs =
+    (await PlanSubApi.getPlanSubPage(queryParams)).list
+
+  formData.value.projectOrderSubs.forEach(item => {
+    if (formData.value.projectPlanSubs.filter(sub => sub.projectSubId == item.id).length > 0) {
+      var subTemp = formData.value.projectPlanSubs.find(sub => sub.projectSubId == item.id)
+      item.projectSubId = subTemp.projectSubId
+      item.projectSubCode = subTemp.projectSubCode
+    }
+  })
+}
+// 保存物料信息
+const saveMaterials =  async () =>{
+  formData.value.matItemDOList.forEach(item => {
+      var subData = item as unknown as MaterialPlanDetailApi.MaterialPlanDetailVO
+      subData.materialId = item.matId
+      subData.projectMaterialPlanId = formData.value.id
+      if (subData.id == undefined) {
+        MaterialPlanDetailApi.createMaterialPlanDetail(subData)
+      } else {
+        MaterialPlanDetailApi.updateMaterialPlanDetail(subData)
+      }
+    })
+}
+// 保存按钮数据提交
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as MaterialPlanApi.MaterialPlanVO
+    await MaterialPlanApi.updateMaterialPlan(data)
+
+    // 保存物料信息
+    await saveMaterials()
+    //formData.value.matItemDOList
+
+    if (formData.value.attachments != undefined && formData.value.attachments.length > 0) {
+      //附件信息保存
+      matUploadData.value.businessId = formData.value.id
+      await matUploadRef.value!.submit()
+    }
+
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const planInit = ref()
+const projectInit = ref()
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 99,
+  projectMaterialPlanId: query.id,
+})
+// 页面数据加载初始化
+onMounted(async () => {
+  // 获取物料需求计划信息
+  formData.value = await MaterialPlanApi.getMaterialPlan(query.id)
+  // 获取生产计划数据
+  planInit.value = await PlanApi.getPlan(formData.value.projectPlanId)
+  // 获取项目订单数据
+  projectInit.value = await ProjectOrderApi.getProjectOrder(formData.value.projectId)
+
+  formData.value.planNo = planInit.value.planNo
+  formData.value.projectName = projectInit.value.projectName
+  formData.value.projectCode = projectInit.value.code
+
+  // 获取物料需求计划的物料列表
+  formData.value.matItemDOList = (await MaterialPlanDetailApi.getMaterialPlanDetailPage(queryParams)).list
+  formData.value.matItemDOList.forEach(item=>{
+    matList.value.push({id:item.matId,name:item.matName})
+
+  })
+  // 获取生产计划单中子项目编号
+  await handleInitPlanSub()
+
+  // 附件信息
+  let attParams = {
+    pageNo: 1,
+    pageSize: 99,
+    businessId: query.id,
+    businessType: 'MATERIALPLAN'
+  }
+  formData.value.attachments = (await getFilePage(attParams)).list
+
+  //用户信息，用于底部数据展示
+  userList.value = await UserApi.getSimpleUserList()
+})
+</script>
\ No newline at end of file
diff --git a/sql/v1.3.0/1.structure.sql b/sql/v1.3.0/1.structure.sql
index 475f6a50..f2b3c4d0 100644
--- a/sql/v1.3.0/1.structure.sql
+++ b/sql/v1.3.0/1.structure.sql
@@ -155,7 +155,7 @@ CREATE TABLE `project_material_plan_detail` (
                                                 `project_material_plan_id` bigint(20) NOT NULL COMMENT '物料需求采购计划id',
                                                 `material_id` bigint(20) NOT NULL COMMENT '物料id',
                                                 `project_sub_id` bigint(20) DEFAULT NULL COMMENT '子项目编号',
-                                                `require_amount` bigint(20) DEFAULT NULL COMMENT '需求数量',
+                                                `require_amount` decimal(11,2) DEFAULT NULL COMMENT '需求数量',
                                                 `require_arrive_time` datetime DEFAULT NULL COMMENT '需求到货日期',
                                                 `description` varchar(255)  DEFAULT NULL COMMENT '备注',
                                                 `creator` varchar(64)  DEFAULT '' COMMENT '创建者',
@@ -165,7 +165,7 @@ CREATE TABLE `project_material_plan_detail` (
                                                 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                                 `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
                                                 PRIMARY KEY (`id`)
-) ENGINE=InnoDB COMMENT='物料需求计划物料详情表';
+) ENGINE=InnoDB  COMMENT='物料需求计划物料详情表';
 
 CREATE OR REPLACE VIEW v_storage_material_log AS
 select 0 AS `deleted`,`lg`.`id` AS `id`,`lg`.`creator` AS `creator`,`lg`.`create_time` AS `create_time`,`lg`.`updater` AS `updater`,`lg`.`update_time` AS `update_time`,