【需求】设备信息使用远程搜索

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java

@@ -80,4 +80,7 @@ public class ProjectOrderSubDO extends BaseDO {
 
     @TableField(exist = false)
     private String projectOrderCode;
+
+    @TableField(exist = false)
+    private String deviceName;
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java

@@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder;
 
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.equip.EquipDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -20,7 +21,8 @@ public interface ProjectOrderSubMapper extends BaseMapperX<ProjectOrderSubDO> {
     default List<ProjectOrderSubDO> selectListByProjectOrderId(Long projectOrderId) {
         MPJLambdaWrapper<ProjectOrderSubDO> query = new MPJLambdaWrapper<>();
         query.selectAll(ProjectOrderSubDO.class)
-                        .select("b.name as compositionName", "p.code as projectOrderCode")
+                        .select("b.name as compositionName", "p.code as projectOrderCode", "e.name as deviceName")
+                        .leftJoin(EquipDO.class, "e", EquipDO::getId, ProjectOrderSubDO::getDeviceModel)
                         .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
                         .leftJoin(CompositionDO.class, "b", CompositionDO::getId, ProjectOrderSubDO::getCompositionId)
                         .disableSubLogicDel()

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue

@@ -115,7 +115,7 @@
           <tr v-for="(item,idx) in formData.projectOrderSubs" :key="idx">
             <td>{{ idx+1 }}</td>
             <td colspan="2">{{item.name}}</td>
-            <td>{{item.deviceModel}}</td>
+            <td>{{item.deviceName}}</td>
             <td></td>
             <td>{{item.amount}}</td>
             <td>{{item.compositionName}}</td>