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/mysql/storage/StorageMapper.java

@@ -37,7 +37,6 @@ public interface StorageMapper extends BaseMapperX<StorageDO> {
                 .like(!StringUtils.isEmpty(reqVO.getMatName()), MaterialDO::getName, reqVO.getMatName())
                 .like(!StringUtils.isEmpty(reqVO.getStockNo()),StorageDO::getStockNo, reqVO.getStockNo())
                 .like(!StringUtils.isEmpty(reqVO.getHeaderNo()),StorageDO::getHeaderNo, reqVO.getHeaderNo())
-                .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
                 .eq(reqVO.getStockType() != null,StorageDO::getStockType, reqVO.getStockType())
                 .eq(reqVO.getStockInType() != null,StorageDO::getStockInType, reqVO.getStockInType())
                 .eq(reqVO.getWhId() != null,StorageDO::getWhId, reqVO.getWhId())

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue

@@ -114,7 +114,7 @@
             <dict-tag :type="DICT_TYPE.HELI_STORAGE_OUT_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="100" />
+        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="180" />
         <el-table-column label="出库仓库" align="center" prop="whId" min-width="120">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
@@ -163,7 +163,7 @@
             <dict-tag :type="DICT_TYPE.HELI_STORAGE_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150" fixed="right">
+        <el-table-column label="操作" align="center" width="180" fixed="right">
           <template #default="scope">
             <el-button link type="primary" @click="openDetail('update', scope.row.id)">
               编辑