Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-heli into dev

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-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java

@@ -259,7 +259,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
                     Map<String, List<ProjectOrderSubDO>> nameGroups = lastSnapshotSubDOList.stream().collect(Collectors.groupingBy(ProjectOrderSubDO::getName));
                     projectOrderSubDOList.forEach(projectOrderSubDO -> {
                         List<ProjectOrderSubDO> lastSnapshotSubs = nameGroups.get(projectOrderSubDO.getName());
-                        if(lastSnapshotSubs.isEmpty()) return;
+                        if(lastSnapshotSubs == null || lastSnapshotSubs.isEmpty()) return;
                         List<FieldInfo> diffFields = FIELD_EQUATOR.getDiffFields(projectOrderSubDO, lastSnapshotSubs.get(0));
                         projectOrderSubDO.setAlterFieldNames(diffFields.stream().map(FieldInfo::getFieldName).collect(Collectors.toSet()));
                     });

mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue

@@ -1,8 +1,8 @@
 <template>
   <transition name="slide-right">
-    <div class="warn" v-if="showWarning" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
+    <div class="warn"  :class="{ 'no-data': !warnings.length }" v-if="showWarning" :style="{ display: warnings.length ? 'block' : 'none' }" :draggable="true" @dragstart="onDragStart" @dragend="onDragEnd" @mousedown.prevent.stop="onMouseDown" @mousemove="onMouseMove" @mouseup="onMouseUp">
       <div class="warntitle">
-        <span class="titleText"> 设计预警通知</span>
+        <span class="titleText">设计预警通知</span>
         <div>
           <span @click="ExpandWran" class="warnclose"> <el-icon>
               <Expand />

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue

@@ -42,8 +42,6 @@ const gitlist = async () => {
   if (propsmodelValue.value) {
     valueName.value = propsmodelValue.value
     const initialUser = await EquipApi.getEquip(valueName.value)
-    console.log(initialUser);
-    
     // 查找初始用户是否已经在 eqyipList 中
     let foundInitialUserInList = false
     for (const eqyip of eqyipList.value) {

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue

@@ -64,14 +64,15 @@ const gitlist = async () => {
     let foundInitialUserInList = false
     for (const user of userList.value) {
       if (user.id === initialUser.id) {
+        propsmodelValue.value=initialUser.username+' '+initialUser.nickname
         foundInitialUserInList = true
         break
       }
     }
     // 如果初始用户不在列表中，则将其添加到列表开头
     if (!foundInitialUserInList && !userSelectList.value.length) {
-      
       userList.value.unshift(initialUser)
+       propsmodelValue.value=initialUser.username+' '+initialUser.nickname
     }
     // loading.value = false
   }

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue

@@ -303,7 +303,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`"  class="mb-0px!">
                         <el-select disabled v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue

@@ -307,7 +307,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="equipId" align="center" min-width="120">
-                    <template #header> 设备信息 </template>
+                    <template #header> 设备型号 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
                         <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">

mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue

@@ -6,8 +6,8 @@
     <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
-      <el-form-item label="工序编号" prop="code">
+      <el-form-item label="工序编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="工序编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        <el-input v-model="queryParams.code" placeholder="工序编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item label="工序名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="工序名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
@@ -45,7 +45,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
       <el-table-column type="index" width="100" label="序号" align="center" />
-      <el-table-column label="工序编号" align="center" prop="code" />
+      <el-table-column label="工序编码" align="center" prop="code" />
       <el-table-column label="工序名称" align="center" prop="name" />
       <el-table-column label="所属车间" align="center" prop="wname" />
       <el-table-column label="是否需要报工" align="center" prop="isReport">

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>

sql/v1.3.0/2.data.sql

@@ -0,0 +1,3 @@
+INSERT INTO `base_equip` (`name`, `mould_type_id`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) (select DISTINCT device_model,0,1,`creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id` from project_sale_order_sub WHERE device_model not in (select name from base_equip) GROUP BY device_model);
+
+UPDATE project_sale_order_sub a left join base_equip b on a.device_model = b.name set a.device_model = b.id;