From 6f7da0dde36e3dcc3b08fa0dc1c40e38193cf9b2 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 29 Jul 2024 20:03:38 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=9A=E6=90=9C=E7=B4=A2=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=94=B9=E4=B8=BA=E6=A8=A1=E7=B3=8A=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99=E3=80=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E6=98=BE=E7=A4=BA=E9=A1=B6=E7=BA=A7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=A9=BA=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=E5=B7=A5=E5=BA=8F=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=80=E5=9C=A8=E6=A5=BC=E5=B1=82=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=B7=A5=E5=BA=8F=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=88=B0=E4=BA=BA=EF=BC=8C=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=85=B3=E8=81=94=E5=88=B0=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98nickname=E3=80=82=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=E7=89=A9=E6=96=99bom=EF=BC=9A=E9=A1=B6=E7=BA=A7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E9=80=89=E6=8B=A9=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mes/MesBaseMaterialInfoMapper.xml    |  2 +-
 hw-ui/src/views/mes/materialBom/index.vue       |  2 +-
 hw-ui/src/views/mes/materialinfo/index.vue      |  5 +----
 hw-ui/src/views/mes/processInfo/index.vue       | 17 +++++++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
index 383637f7..eb921657 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
+++ b/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},
diff --git a/hw-ui/src/views/mes/materialBom/index.vue b/hw-ui/src/views/mes/materialBom/index.vue
index 2a97a5b1..7a972f5a 100644
--- a/hw-ui/src/views/mes/materialBom/index.vue
+++ b/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"
diff --git a/hw-ui/src/views/mes/materialinfo/index.vue b/hw-ui/src/views/mes/materialinfo/index.vue
index 26b516f9..0521a456 100644
--- a/hw-ui/src/views/mes/materialinfo/index.vue
+++ b/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");
       });
     },
     /** 删除按钮操作 */
diff --git a/hw-ui/src/views/mes/processInfo/index.vue b/hw-ui/src/views/mes/processInfo/index.vue
index 8708da4a..dd28e16a 100644
--- a/hw-ui/src/views/mes/processInfo/index.vue
+++ b/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;
+      }
     },
     /** 工序关联人员删除按钮操作 */