Merge remote-tracking branch 'origin/master'

ruoyi-admin-vue/src/views/inventory/report_view/inbound_outbound_statistics.vue

@@ -63,10 +63,10 @@
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="物料" prop="materialId">
+      <el-form-item label="物料名称" prop="materialId">
         <el-input
           v-model="queryParams.materialId"
-          placeholder="请输入物料或编码"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />

ruoyi-admin-vue/src/views/inventory/report_view/inventory_detail.vue

@@ -63,7 +63,7 @@
       <el-form-item label="SAP物料号" prop="materialId">
         <el-input
           v-model="queryParams.materialId"
-          placeholder="请输入物料编码"
+          placeholder="请输入SAP物料号"
           clearable
           @keyup.enter.native="handleQuery"
         />

ruoyi-admin-vue/src/views/inventory/stocktakes/index.vue

@@ -146,9 +146,9 @@
 <!--    盘点对话框-->
     <el-dialog :title="checkTitle" :visible.sync="checkOpen" width="1500px" append-to-body>
       <el-form ref="checkFormRef" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="盘点单号" prop="stocktakeId" >
+                <!-- <el-form-item label="盘点单号" prop="stocktakeId" >
                   <el-input v-model="form.stocktakeId" placeholder="请输入盘点单号" disabled />
-                </el-form-item>
+                </el-form-item> -->
         <el-form-item label="计划日期" prop="plannedDate">
           <el-date-picker clearable disabled
                           v-model="form.plannedDate"
@@ -178,9 +178,9 @@
     <!--    盘点确认弹窗-->
     <el-dialog :title="confirmTitle" :visible.sync="confirmOpen" width="1500px" append-to-body>
       <el-form ref="confirmFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="盘点单号" prop="stocktakeId" >
+        <!-- <el-form-item label="盘点单号" prop="stocktakeId" >
           <el-input v-model="form.stocktakeId" placeholder="请输入盘点单号" disabled />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计划日期" prop="plannedDate">
           <el-date-picker clearable disabled
                           v-model="form.plannedDate"

ruoyi-admin-vue/src/views/inventory/stocktakes/stocktakeItemsTable.vue

@@ -353,10 +353,10 @@ console.log(this.isConfirm)
 
     /** 打开库位选择器 */
     openLocationSelector() {
-      if (!this.searchParams.warehouseId) {
-        this.$message.warning("请先选择仓库")
-        return
-      }
+      // if (!this.searchParams.warehouseId) {
+      //   this.$message.warning("请先选择仓库")
+      //   return
+      // }
       this.locationSelectorVisible = true
     },
 

ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -220,7 +220,7 @@
         <where>
             and i.quantity != 0 and i.inventory_status = 1 and i.is_used = 1
             <if test="inventoryType != null "> and i.inventory_type = #{inventoryType}</if>
-            <if test="materialId != null  and materialId != ''"> and m.material_code like concat('%', #{materialId}, '%')</if>
+            <if test="materialId != null  and materialId != ''"> and m.material_name like concat('%', #{materialId}, '%')</if>
             <if test="batchId != null  and batchId != ''"> and i.batch_id like concat('%', #{batchId}, '%')</if>
             <if test="warehousesId != null  and warehousesId != ''"> and w.warehouses_id = #{warehousesId}</if>
             <if test="locationId != null  and locationId != ''"> and i.location_id = #{locationId}</if>