修改平库盘点逻辑 库存物料状态、库存状态、货位状态、货位是否锁定逻辑修改

ruoyi-ui/src/views/stock/management/index.vue

@@ -17,8 +17,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('stockManagement.stockStatus')" prop="cargoSpaceStockStatus"><!-- 库存状态 -->
-        <el-select v-model="queryParams.cargoSpaceStockStatus" :placeholder="$t('stockManagement.selectStockStatus')" clearable>
+      <el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"><!-- 库存状态 -->
+        <el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>
           <el-option
             v-for="dict in dict.type.stock_status"
             :key="dict.value"
@@ -27,6 +27,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('stockManagement.cargoSpaceStockStatus')" prop="cargoSpaceStockStatus"><!-- 货位状态 -->
+        <el-select v-model="queryParams.cargoSpaceStockStatus" :placeholder="$t('stockManagement.cargoSpaceStockStatus')" clearable>
+          <el-option
+            v-for="dict in dict.type.cargo_space_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"><!-- 物料状态 -->
         <el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" clearable>
           <el-option
@@ -37,14 +47,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"><!-- 批次号 -->
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('stockManagement.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"><!-- 入库时间 -->
         <el-input
           v-model="queryParams.inDate"
@@ -250,14 +252,19 @@
       <el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
       <el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
       <el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
-      <el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="cargoSpaceStockStatus"> <!-- 库存状态 -->
+      <el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus" ><!-- 库存状态 -->
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.cargoSpaceStockStatus"/>
+          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
+      <el-table-column :label="$t('stockManagement.cargoSpaceStockStatus')" align="center" prop="cargoSpaceStockStatus"> <!-- 货位状态 -->
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
+          <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" ><!--货位状态-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
         </template>
       </el-table-column><!-- 货位状态 -->
       <el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
@@ -265,7 +272,6 @@
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
 <!--      <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
       <el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
       <el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
@@ -323,8 +329,8 @@
         <el-form-item :label="$t('stockManagement.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位id -->
           <el-input v-model="form.cargoSpaceId" :placeholder="$t('stockManagement.inputCargoSpaceId')" />
         </el-form-item>
-        <el-form-item :label="$t('stockManagement.stockStatus')" prop="cargoSpaceStockStatus"> <!-- 库存状态 -->
-          <el-select v-model="form.cargoSpaceStockStatus" :placeholder="$t('stockManagement.selectStockStatus')">
+        <el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
+          <el-select v-model="form.stockStatus" :placeholder="$t('stockManagement.selectStockStatus')">
             <el-option
               v-for="dict in dict.type.stock_status"
               :key="dict.value"
@@ -333,7 +339,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> <!-- 货位状态 -->
+<!--        <el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> &lt;!&ndash; 货位状态 &ndash;&gt;
           <el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
             <el-option
               v-for="dict in dict.type.cargo_space_status"
@@ -342,7 +348,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
 <!--        <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> &lt;!&ndash; 物料状态 &ndash;&gt;-->
 <!--          <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
 <!--            <el-option-->
@@ -424,7 +430,7 @@ import { listManagement, getManagement, delManagement, addManagement, updateMana
 import {listWarehouse} from "@/api/bas/warehouse"
 export default {
   name: "Management",
-  dicts: ['product_status', 'stock_status','cargo_space_status'],
+  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层