From 52db713a316612b8a884faf3b32d93fa9e905448 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Thu, 16 Oct 2025 16:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=91=E6=9C=9F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java  | 2 ++
 .../heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java   | 3 +--
 .../purchaseordernodetail/PurchaseOrderNoDetailMapper.java  | 2 +-
 .../mes/module/heli/service/plansub/PlanSubServiceImpl.java | 6 ++++--
 mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue | 1 +
 .../src/views/heli/partpurchaseorder/index.vue              | 4 ++++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java
index 66cfc128..73701b52 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java
@@ -100,4 +100,6 @@ public class PlanSubDetailDO extends BaseDO {
     private String  projectName;
     @TableField(exist = false)
     private String planNo;
+    @TableField(exist = false)
+    private String projectNameSim;
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java
index 2b411c60..399b3785 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java
@@ -47,7 +47,7 @@ public interface PlanSubDetailMapper extends BaseMapperX<PlanSubDetailDO> {
         MPJLambdaWrapper<PlanSubDetailDO> query = new MPJLambdaWrapper<>();
 
         query.selectAll(PlanSubDetailDO.class)
-                .select("p.project_name as projectName","c.brief as customerBrief")
+                .select("p.project_name as projectName","c.brief as customerBrief","p.project_name_sim as projectNameSim")
                 .leftJoin(ProjectOrderDO.class,"p",ProjectOrderDO::getId,PlanSubDetailDO::getProjectId)
                 .leftJoin(CustomerDO.class,"c",CustomerDO::getId,ProjectOrderDO::getCustomerId)
                 .orderByAsc(PlanSubDetailDO::getStartTwoDimDate);
@@ -59,7 +59,6 @@ public interface PlanSubDetailMapper extends BaseMapperX<PlanSubDetailDO> {
                 .or()
                 .ge( PlanSubDetailDO::getTwoDimDate, reqVO.getStartTime()))
                 .in(PlanSubDetailDO::getIsOverProcess,0,2);
-
         return selectPage(reqVO, query);
     }
 
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 98e7463f..1cec9124 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
@@ -273,7 +273,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
                 .eq(pageReqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, pageReqVO.getGoodsType())
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, pageReqVO.getProjectName())
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode())
-                .like(!StringUtils.isEmpty(pageReqVO.getCustomerName()), CustomerDO::getName, pageReqVO.getCustomerName())
+                .like(!StringUtils.isEmpty(pageReqVO.getCustomerName()), CustomerDO::getBrief, pageReqVO.getCustomerName())
                 .like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, pageReqVO.getProjectSubName())
                 .like(!StringUtils.isEmpty(pageReqVO.getUsername()), AdminUserDO::getNickname, pageReqVO.getUsername())
                 .like(!ObjectUtil.isEmpty(pageReqVO.getBoomName()), PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getBoomName())
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java
index fe75b5e7..3f83c309 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java
@@ -91,10 +91,12 @@ public class PlanSubServiceImpl implements PlanSubService {
                 userIds.add(planSubSaveReqVO.getBlankOwner());
             }
         }
-        List<PlanSubDetailDO> planSubDetailDOS = planSubDetailMapper.selectExistList(userIds);
+        if (ObjectUtil.isNotEmpty(userIds)){
+            List<PlanSubDetailDO> planSubDetailDOS = planSubDetailMapper.selectExistList(userIds);
+            checkForConflicts(list,planSubDetailDOS);
+        }
         List<PlanSubDetailDO> insertList = new ArrayList<>();
         //检查冲突
-        checkForConflicts(list,planSubDetailDOS);
         List<PlanSubDO> bean = BeanUtils.toBean(list, PlanSubDO.class);
         planSubMapper.updateBatch(bean);
         if (CollUtil.isNotEmpty(inserList)){
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
index 7f6f9a6e..822407e9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
@@ -85,6 +85,7 @@
       >
         <el-table-column fixed label="序号" type="index" width="70" align="center" />
         <el-table-column fixed label="项目编码" align="center" prop="code" min-width="130" />
+        <el-table-column fixed label="项目简码" align="center" prop="projectNameSim" min-width="130" />
         <el-table-column fixed label="子项目名称" align="center" prop="name" min-width="180" />
         <el-table-column min-width="110px" align="center">
           <template #header>设计类型</template>
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 7184bc21..3b1432a9 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
@@ -227,6 +227,10 @@ const submitForm = async () => {
 
     // 2. 检查供应商一致性
     const firstSupplierId = list[0].supplierId;
+    console.log(firstSupplierId)
+    list.forEach((item, index) => {
+      console.log(`第${index}个:`, item.supplierId, '类型:', typeof item.supplierId, '相等:', item.supplierId === firstSupplierId);
+    });
     if (list.some(item => item.supplierId !== firstSupplierId)) {
       message.error("零件采购订单不属于同一个供应商，请确认");
       return;