From a38727d8f0f913f71481894ed7d8265867600013 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Thu, 30 Oct 2025 16:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/materialplanboom/MaterialPlanBoomMapper.java  | 1 +
 .../purchaseordernodetail/PurchaseOrderNoDetailMapper.java  | 6 ++++--
 .../src/views/heli/deliverorder/detail.vue                  | 2 +-
 3 files changed, 6 insertions(+), 3 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 b5dae243..39fd02e6 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
@@ -247,6 +247,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
                 .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim)
                 .leftJoin(MaterialPlanDO.class, "p",  MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId)
                 .leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId)
+                .leftJoin(ProjectOrderDO.class,"pro",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
                 .leftJoin(ProjectOrderSubDO.class,"sub",ProjectOrderSubDO::getId,MaterialPlanBoomDO::getProjectPlanSubId)
                 .leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
                 .leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
index 56d7140b..f9fe9098 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
@@ -223,7 +223,9 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
 //           ).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName()));
 //       }
        if (pageReqVO.getSubOrDetailName() != null && !pageReqVO.getSubOrDetailName().trim().equals("")){
-           query.and( e ->e.eq(ProjectOrderDO::getProjectName, pageReqVO.getSubOrDetailName()).or().eq(
+           query.and( e ->e.like(PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getSubOrDetailName()).or().like(
+                   ProcessBomDetailDO::getBlueprintNo, pageReqVO.getSubOrDetailName()
+           ).or().like(ProcedureDO::getName, pageReqVO.getSubOrDetailName()).or().eq(ProjectOrderDO::getProjectName, pageReqVO.getSubOrDetailName()).or().eq(
                    ProjectOrderSubDO::getName, pageReqVO.getSubOrDetailName()
            ).or().eq(ProcessBomDetailDO::getMaterialName, pageReqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, pageReqVO.getSubOrDetailName()));
            //   query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
@@ -294,4 +296,4 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
                 .orderByDesc(PurchaseOrderNoDetailDO::getCreateTime);
         return selectPage(pageReqVO, query);
     }
-}
\ No newline at end of file
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
index b5ef9aae..dae371a7 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -154,7 +154,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="重量(T)" prop="transportWeight" >
-              <el-input :disabled="detailDisabled" v-model="formData.transportWeight" class="!w-250px" />
+              <el-input :disabled="detailDisabled || formData.deliverStatus == 2" v-model="formData.transportWeight" class="!w-250px" />
             </el-form-item>
           </el-col>
           <el-col :span="6">