change - 物料信息：搜索物料编码改为模糊，不区分大小写。修改物料类型时，不要显示顶级节点，显示空

工序信息增加所在楼层，自动化工序不需要关联到人，人工工序关联到人，保存nickname。
         物料bom：顶级节点不需要选择检验类型

hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml

@@ -82,7 +82,7 @@
         <include refid="selectMesBaseMaterialInfoVo"/>
         <where>
             <if test="erpId != null ">and bmi.erp_id = #{erpId}</if>
-            <if test="materialCode != null  and materialCode != ''">and bmi.material_code = #{materialCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and bmi.material_code like concat('%', #{materialCode},'%')</if>
             <if test="oldMaterialCode != null  and oldMaterialCode != ''">and bmi.old_material_code = #{oldMaterialCode}
             </if>
             <if test="materialName != null  and materialName != ''">and bmi.material_name like concat('%', #{materialName},

hw-ui/src/views/mes/materialBom/index.vue

@@ -202,7 +202,7 @@
         <!--            >{{dict.label}}</el-radio>-->
         <!--          </el-radio-group>-->
         <!--        </el-form-item>-->
-        <el-form-item label="校验类型" prop="checkType">
+        <el-form-item label="校验类型" prop="checkType" v-if="form.topFlag === 0">
           <el-radio-group v-model="form.checkType">
             <el-radio
               v-for="dict in dict.type.check_type"

hw-ui/src/views/mes/materialinfo/index.vue

@@ -481,10 +481,7 @@ export default {
     /** 查询物料类型信息下拉树结构 */
     getTreeselect() {
       listBaseMaterialType().then(response => {
-        this.baseMaterialTypeOptions = [];
-        const data = {matrialTypeId: 0, typeName: '顶级节点', children: []};
-        data.children = this.handleTree(response.data, "matrialTypeId", "parentId");
-        this.baseMaterialTypeOptions.push(data);
+        this.baseMaterialTypeOptions = this.handleTree(response.data, "matrialTypeId", "parentId");
       });
     },
     /** 删除按钮操作 */

hw-ui/src/views/mes/processInfo/index.vue

@@ -85,6 +85,7 @@
           <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
         </template>
       </el-table-column>
+      <el-table-column label="所在楼层" align="center" prop="processFloor" v-if="columns[11].visible"/>
       <el-table-column label="标准工时" align="center" prop="productionTime" v-if="columns[4].visible">
         <template slot-scope="scope">
           <span>{{ formatDayHourMinutes(scope.row.productionTime) }}</span>
@@ -128,6 +129,7 @@
             size="mini"
             type="text"
             icon="el-icon-s-check"
+            v-if="scope.row.processType !== '3'"
             @click="handleUserUpdate(scope.row)"
           >关联人员
           </el-button>
@@ -163,6 +165,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="所在楼层" prop="processFloor">
+          <el-input v-model="form.processFloor" placeholder="请输入所在楼层"/>
+        </el-form-item>
         <el-form-item label="标准工时" prop="productionTime">
           <el-input-number v-model="form.productionTimeDays" placeholder="请输入天数" :min="0" :max="10000"
                            :controls="false" :style="{ width: '50px' }"/>
@@ -362,6 +367,7 @@ export default {
         processCode: null,
         processName: null,
         processType: null,
+        processFloor: null,
         productionTime: null,
         activeFlag: null,
         remark: null,
@@ -392,6 +398,7 @@ export default {
         {key: 8, label: `创建时间`, visible: true},
         {key: 9, label: `更新人`, visible: false},
         {key: 10, label: `更新时间`, visible: true},
+        {key: 11, label: `所在楼层`, visible: true},
       ],
       //产线选项
       prodLineList: [],
@@ -433,6 +440,7 @@ export default {
         processName: null,
         processType: null,
         productionTime: null,
+        processFloor: null,
         productionTimeDays: 0,
         productionTimeHours: 0,
         productionTimeMinutes: 0,
@@ -618,8 +626,13 @@ export default {
     },
 
     //在选择下拉列表时赋username的值
-    handleSelectUser(){
-      const selected = this.userList.find(option => option.value === newValue);
+    handleSelectUser(row){
+      const selectedUser = this.userList.find(user => user.userId === row.userId);
+      if (selectedUser) {
+        row.userName = selectedUser.nickName;
+      } else {
+        row.userName = null;
+      }
     },
     /** 工序关联人员删除按钮操作 */