修改页面显示，修改盘点创建页面 筛选已盘点库存

ruoyi-ui/src/api/out/outStockout.js

@@ -26,6 +26,8 @@ export function getOutStockoutDetail(query) {
       params: query
     })
   }
+
+
 //单据保存
   export function saveOutStock(data)
   {

ruoyi-ui/src/api/stock/management.js

@@ -17,6 +17,15 @@ export function getManagement(stockId) {
   })
 }
 
+// 查询可出库的库存物资信息列表
+export function listProductAndStockPd(query) {
+  return request({
+    url: '/out/productAndStock/pd/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 新增库存信息
 export function addManagement(data) {
   return request({
@@ -42,3 +51,10 @@ export function delManagement(stockId) {
     method: 'delete'
   })
 }
+//重置盘点记录
+export function resetPdRecord() {
+  return request({
+    url: '/stock/management/resetPdRecord',
+    method: 'get',
+  })
+}

ruoyi-ui/src/views/check/create/index.vue

@@ -78,6 +78,8 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button icon="info" size="mini" @click="resetPdRecordButton" v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录</el-button>
+
           </el-form-item>
         </el-form>
 
@@ -141,7 +143,7 @@
       </el-dialog>
 
       <!-- 选择托盘弹窗 -->
-      <el-dialog title="选择托盘编码" :visible.sync="materialDialogByTrayCode" width="800px" append-to-body>
+      <el-dialog title="选择货位" :visible.sync="materialDialogByTrayCode" width="800px" append-to-body>
         <el-form :model="trayQueryParams" ref="trayQueryForm" size="small" :inline="true" label-width="68px">
 
           <el-form-item label="货位名称" prop="cargoSpaceName">
@@ -172,6 +174,8 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleTrayQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetTrayQuery">重置</el-button>
+            <el-button icon="info" size="mini" @click="resetPdRecordButton" v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录</el-button>
+
           </el-form-item>
         </el-form>
 
@@ -254,11 +258,10 @@
   </template>
 
   <script>
-  import { listProductAndStock } from "@/api/out/outStockout";
-  import { listWarehouse } from "@/api/bas/warehouse";
-  import { saveCheckStock } from "@/api/check/stockCheck";
-  import { listManagement} from "@/api/stock/management"
-  import { listCargoSpaceByRoadway} from "@/api/bas/cargoSpace"
+  import {listWarehouse} from "@/api/bas/warehouse";
+  import {saveCheckStock} from "@/api/check/stockCheck";
+  import {listManagement,listProductAndStockPd,resetPdRecord} from "@/api/stock/management"
+  import {listCargoSpaceByRoadway} from "@/api/bas/cargoSpace"
 
   export default {
     name: "AddOutStock",
@@ -314,7 +317,8 @@
           lotNo: null,
           productName: null,
           quantity: null,
-          warehouseId: null
+          warehouseId: null,
+          spare7: 0
         },
         // 托盘查询参数
         trayQueryParams: {
@@ -374,7 +378,7 @@
       getMaterialList() {
         this.materialLoading = true;
         if (this.formData.checkType==='1'){
-          listProductAndStock(this.queryParams).then(response => {
+          listProductAndStockPd(this.queryParams).then(response => {
             this.materialOptions = response.rows;
             this.total = response.total;
             this.materialLoading = false;
@@ -388,6 +392,9 @@
           this.trayQueryParams.warehouseId = "01";
           this.trayQueryParams.status = 2;
           this.trayQueryParams.locked='N';
+          this.trayQueryParams.spare7='0';
+          this.trayQueryParams.stockStatus = 1;
+
           listCargoSpaceByRoadway(this.trayQueryParams).then(response => {
             this.trayOptions = response.rows;
             this.trayTotal = response.total;
@@ -551,6 +558,13 @@
         this.resetForm("trayQueryForm");
         this.handleTrayQuery();
       },
+      /** 重置重置按钮操作 */
+      resetPdRecordButton() {
+        resetPdRecord().then(response => {
+          this.$modal.msgSuccess('重置成功');
+          this.handleQuery();
+        })
+      },
       /** 删除物资 */
       handleDelete(index) {
         this.materialList.splice(index, 1);