diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermakedetail/vo/PurchaseOrderMakeDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermakedetail/vo/PurchaseOrderMakeDetailRespVO.java
index 7905bc0..2d2548e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermakedetail/vo/PurchaseOrderMakeDetailRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermakedetail/vo/PurchaseOrderMakeDetailRespVO.java
@@ -134,5 +134,6 @@ public class PurchaseOrderMakeDetailRespVO {
     @Schema(description = "责任人id", example = "25680")
     @ExcelProperty("责任人id")
     private Long duEmpId;
-
+    @Schema(description = "物料名称")
+    private String matName;
 }
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 9b5b2a6..699bbde 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
@@ -128,6 +128,8 @@ public class MaterialPlanBoomDO extends BaseDO {
     @TableField(exist = false)
     private String nickname;
     @TableField(exist = false)
+    private String materialNames;
+    @TableField(exist = false)
     private String blueprintNo;
     @TableField(exist = false)
     private Long matId;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
index 89b924c..03493a5 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
@@ -167,5 +167,6 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
     private String isFoam;
     @TableField(exist = false)
     private String projectName;
-
+    @TableField(exist = false)
+    private String matName;
 }
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 9a17a64..6e82f1b 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
@@ -77,7 +77,6 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
                 //   .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")
        //         .select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
                 .select("b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
-                .select("m.code as matCode")
 
                 .select("bc.`name` as compositionName","b.`composition_id` as compositionId")
                 .select("ma.brief as customerBriefName,ma.project_name as projectName,ma.name as projectSubName,ma.project_id as projectId")
@@ -87,8 +86,6 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
                 .leftJoin(CompositionDO.class, "bc", CompositionDO::getId, ProcessBomDetailDO::getCompositionId)
                 .leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
                 .leftJoin(AdminUserDO.class,"u",AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
-                .leftJoin(PurchaseOrderMakeDetailDO.class,"p",PurchaseOrderMakeDetailDO::getId, MaterialPlanBoomDO::getProjectPurchaseOrderMakeDetailId)
-                .leftJoin(MaterialDO.class,"m",MaterialDO::getId,PurchaseOrderMakeDetailDO::getMaterialId)
                 .eq(MaterialPlanDO::getMatType,0)
                 .in(MaterialPlanBoomDO::getIsPurYard,Arrays.asList(0,5))
                 .disableSubLogicDel()
@@ -185,7 +182,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
     default PageResult<MaterialPlanBoomDO> getStandardPartsPages(MaterialPlanPageReqVO pageReqVO){
         MPJLambdaWrapper<MaterialPlanBoomDO> query = new MPJLambdaWrapper<>();
         query.selectAll(MaterialPlanBoomDO.class)
-                .select("p.project_name as projectName","p.project_id as projectId","p.name as projectSubName","mat.material_id as matId","m.code as materialName","m.code as matCode")
+                .select("p.project_name as projectName","p.project_id as projectId","p.name as projectSubName","mat.material_id as matId","m.code as materialName","m.name as materialNames")
                 .select("d.spec as boomSpec","d.blueprint_no as blueprintNo","d.unit as boomUnit","DATE_FORMAT(t.boom_arrive_date, '%Y-%m-%d') AS boomArriveDates")
                 .leftJoin(MaterialPlanDO.class, "p",  MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId)
                 .leftJoin(ProjectOrderDO.class,"b",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
index ff17399..5897439 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
@@ -20,6 +20,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
 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.service.purchaseordermakedetail.PurchaseOrderMakeDetailService;
@@ -39,12 +40,15 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
     default PageResult<PurchaseOrderMakeDetailDO> selectPage(PurchaseOrderMakeDetailPageReqVO reqVO) {
         MPJLambdaWrapper<PurchaseOrderMakeDetailDO> query = new MPJLambdaWrapper<>();
         query.selectAll(PurchaseOrderMakeDetailDO.class)
-                .select("b.material_name as boomName","b.spec as boomSpec","b.unit as boomUnit")
+                .select("b.material_name as boomName","b.spec as boomSpec","b.unit as boomUnit","m.name as matName")
            //     .select("pom.purchase_no as purchaseNo")
                 .leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getId,PurchaseOrderMakeDetailDO::getBoomDetailId)
                 .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PurchaseOrderMakeDetailDO::getProjectPlanSubId)
                 .leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
                 .leftJoin(PurchaseOrderMakeDO.class,"pom",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)
+                .leftJoin(PurchaseOrderNoDetailDO.class,"no",PurchaseOrderNoDetailDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderNoDetailId)
+                .leftJoin(MaterialDO.class,"m",MaterialDO::getId,PurchaseOrderNoDetailDO::getMaterialId)
+                .disableSubLogicDel()
                 .eq(PurchaseOrderMakeDO::getGoodsType,1)
                 .eq(PurchaseOrderMakeDO::getStatus,2);
         if (!StringUtils.isEmpty(reqVO.getProjectName())){
@@ -127,6 +131,7 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
                .leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, PurchaseOrderMakeDetailDO::getProcedureId)
                .disableLogicDel()
                .disableSubLogicDel()
+               .eq(PurchaseOrderMakeDetailDO::getDeleted, 0)
                .eq(Objects.nonNull(partPurchaseOrderPageReqVO.getPurchaseOrderId()), PurchaseOrderMakeDO::getId, partPurchaseOrderPageReqVO.getPurchaseOrderId())
                .eq(StringUtils.isNotBlank(partPurchaseOrderPageReqVO.getContractNo()), PurchaseOrderMakeDO::getContractNo, partPurchaseOrderPageReqVO.getContractNo())
                .eq(Objects.nonNull(partPurchaseOrderPageReqVO.getDocumentStatus()), PurchaseOrderMakeDO::getStatus, partPurchaseOrderPageReqVO.getDocumentStatus())
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java
index 0747811..b450a33 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java
@@ -122,7 +122,6 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
                     }
                     makeDetailDO.setBoomDetailId(dp.getBoomDetailId());
                     makeDetailDO.setBoomName(dp.getMatName());
-                    makeDetailDO.setMaterialId(dp.getMaterialId());
                     makeDetailDO.setBoomSpec(dp.getMatSpec());
                     makeDetailDO.setBoomUnit(dp.getMatUnit());
                     makeDetailDO.setComposition(dp.getCompositionName());
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java
index dfc7b2f..64dc86c 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java
@@ -308,7 +308,7 @@ public class StorageInServiceImpl implements StorageInService {
             }
             storageInDetailDO.setPurchaseOrderNoId(orderNoDetailDO.getPurchaseOrderId());
             storageInDetailDO.setPurchaseOrderNoDetailId(orderNoDetailDO.getId());
-            storageInDetailDO.setAcarrDate(new Date());
+            storageInDetailDO.setAcarrDate(orderNoDetailDO.getBoomArriveDates());
             if (orderNoDetailDO.getPurchaseRemAmount().compareTo(orderNoDetailDO.getPurchaseRemAmounts())==0){
                 orderNoDetailDO.setReceivingStatus(3);
             }else {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue
index 763716d..5b6363d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue
@@ -96,7 +96,7 @@
 <!--    </el-select>-->
 <!--</template>-->
           <template #default="scope">
-            <el-input v-model="scope.row.boomCode"  disabled>
+            <el-input v-model="scope.row.matName"  disabled>
               <template #suffix>
                 <Icon @click="serachLog(scope.row)" icon="ep:search"  color="primary"/>
               </template>
@@ -290,12 +290,15 @@ const handleExportDetail = async () => {
     exportLoading.value = false
   }
 }
-const getMat = async (rowids,ids,matCodes) => {
+const getMat = async (rowids,ids,matCodes,name) => {
   //formData.value.boomItemDOList = arrBoom
   for(var i = 0 ; i < list.value.length ; i ++){
     if(list.value[i].id == rowids){
+      console.log(name)
       list.value[i].boomCode = matCodes
       list.value[i].materialId = ids
+      list.value[i].matName = name
+      console.log(list.value[i].matName)
       // await updateRow(2,list.value[i]);
       break;
     }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue
index 820a87e..c6d8a8d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue
@@ -91,10 +91,10 @@
             <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" />
           </template>
         </el-table-column>
-        <el-table-column label="物料编码" align="center" prop="matCode" min-width="180" >
+        <el-table-column label="物料编码" align="center" prop="materialName" min-width="180" >
 
                       <template #default="scope">
-              <el-input v-model="scope.row.matCode"  disabled>
+              <el-input v-model="scope.row.materialName"  disabled>
                 <template #suffix>
                   <Icon @click="serachLog(scope.row)" icon="ep:search"  color="primary"/>
                 </template>
@@ -255,13 +255,14 @@ const handleExportDetail = async () => {
     exportLoading.value = false
   }
 }
-const getMat = async (rowids,amount,ids,matCodes) => {
+const getMat = async (rowids,amount,ids,matCodes,name) => {
   //formData.value.boomItemDOList = arrBoom
   for(var i = 0 ; i < list.value.length ; i ++){
     if(list.value[i].id == rowids){
       list.value[i].matRest = amount
             list.value[i].matCode = matCodes
       list.value[i].materialId = ids
+      list.value[i].materialName = name
       // await updateRow(2,list.value[i]);
       break;
     }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLog.vue
index 9cf4a1e..948c990 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLog.vue
@@ -23,7 +23,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table
-ref="multipleTableRef" v-loading="loading" :data="list" :stripe="true" 
+ref="multipleTableRef" v-loading="loading" :data="list" :stripe="true"
     @row-click="clickRow"   @selection-change="handleCurrentChange" :show-overflow-tooltip="true" class="hl-table">
                        <el-table-column
                         type="selection"
@@ -181,7 +181,7 @@ const emit = defineEmits(['success'])
 const success = () =>{
   dialogVisible.value = false;
   console.log(clickItem.value)
-  emit('success',rowid.value,clickItem.value[0].storageOkQty,clickItem.value[0].id,clickItem.value[0].matCode)
+  emit('success',rowid.value,clickItem.value[0].storageOkQty,clickItem.value[0].id,clickItem.value[0].matCode,clickItem.value[0].matName)
 }
 const handleRg = async (rgid) => {
   pnCurrentList.value =[]
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue
index fa46ac2..ef06457 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue
@@ -163,7 +163,7 @@ const emit = defineEmits(['success'])
 //  emit('success', multipleSelection.value)
 const success = () => {
   dialogVisible.value = false;
-  emit('success', rowid.value, clickItem.value[0].id, clickItem.value[0].code)
+  emit('success', rowid.value, clickItem.value[0].id, clickItem.value[0].code, clickItem.value[0].name)
 
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/standardParts.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/standardParts.vue
index 06d2cbd..3934267 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/standardParts.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/standardParts.vue
@@ -72,7 +72,7 @@
 <!--          </el-form-item>-->
 <!--        </template>-->
         <template #default="scope">
-          <el-input v-model="scope.row.matCode"  disabled>
+          <el-input v-model="scope.row.materialNames"  disabled>
             <template #suffix>
               <Icon @click="serachLog(scope.row)" icon="ep:search"  color="primary"/>
             </template>
@@ -196,12 +196,13 @@ const getList = async () => {
 const serachLog = (row) => {
   matLogRef.value.open(row.id)
 }
-const getMat = async (rowids,ids,matCodes) => {
+const getMat = async (rowids,ids,matCodes,name) => {
   //formData.value.boomItemDOList = arrBoom
   for(var i = 0 ; i < list.value.length ; i ++){
     if(list.value[i].id == rowids){
       list.value[i].matCode = matCodes
       list.value[i].matId = ids
+      list.value[i].materialNames = name
       break;
     }
   }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/storageLog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/storageLog.vue
index d4e33e5..b5c313c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/storageLog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/matreq/storageLog.vue
@@ -163,7 +163,7 @@ const emit = defineEmits(['success'])
 //  emit('success', multipleSelection.value)
 const success = () => {
   dialogVisible.value = false;
-  emit('success', rowid.value, clickItem.value[0].id, clickItem.value[0].code)
+  emit('success', rowid.value, clickItem.value[0].id, clickItem.value[0].code, clickItem.value[0].name)
 
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue
index b1c8824..43ea2e3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue
@@ -20,7 +20,7 @@
         </el-form-item>
         <el-form-item label="采购状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="请选择采购状态" clearable class="!w-240px">
-            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.PART_PURCHASE_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="责任人" prop="ownerName">
@@ -76,7 +76,7 @@
                 <el-table-column label="订单状态" align="center" prop="orderStatus" min-width="100" >
                   <template #default="scope">
                     {{
-                      getIntDictOptions(DICT_TYPE.PART_PURCHASE_STATUS).find(
+                      getIntDictOptions(DICT_TYPE.HELI_PURCHASE_STATUS).find(
                           (dict) => dict.value === scope.row.orderStatus
                       )?.label || '未知状态'
                     }}