From a740f637587beae1664e6ae26c494f3636ee6cad Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Tue, 9 Apr 2024 14:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B7=BB=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=20=20=20=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busFunctions/reportForms/lockInStock.js   |   3 +-
 .../inventory/InventoryEntry.vue              | 186 +++++++++--------
 src/views/libraryManage/inventory/config.js   | 189 +++++++++---------
 .../libraryManage/inventory/inventory.vue     |   5 +-
 .../libraryManage/lockOutStore/index.vue      |  64 ++----
 5 files changed, 214 insertions(+), 233 deletions(-)

diff --git a/src/api/wms/busFunctions/reportForms/lockInStock.js b/src/api/wms/busFunctions/reportForms/lockInStock.js
index 3c2e535..f7f0c8c 100644
--- a/src/api/wms/busFunctions/reportForms/lockInStock.js
+++ b/src/api/wms/busFunctions/reportForms/lockInStock.js
@@ -52,7 +52,8 @@ export function unLockStockQty(data) {
 //锁定库存出库列表
 export function getLockstockOutList(data) {
   return request({
-    url: '/wms/lock/getLockstockOutList',
+    // url: '/wms/lock/getLockstockOutList',
+    url: 'wms/stock/lock/getLockstockOutList',
     method: 'get',
     params: data
   })
diff --git a/src/views/libraryManage/inventory/InventoryEntry.vue b/src/views/libraryManage/inventory/InventoryEntry.vue
index 6f181ad..2c5fa30 100644
--- a/src/views/libraryManage/inventory/InventoryEntry.vue
+++ b/src/views/libraryManage/inventory/InventoryEntry.vue
@@ -2,7 +2,10 @@
   <div class="app-container">
     <!-- 盘点录入 -->
     <div class="search-box">
-      <el-form :inline="true" :model="enterForm">
+      <el-form
+        :inline="true"
+        :model="enterForm"
+      >
         <el-form-item label="单据编号">
           <el-input
             v-model="enterForm.invOrderNo"
@@ -10,9 +13,26 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="物料">
+          <el-input
+            v-model="enterForm.invOrderNo"
+            placeholder="请输入物料"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="货位">
+          <el-input
+            v-model="enterForm.locationCode"
+            placeholder="请输货位"
+            clearable
+          ></el-input>
+        </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="queryTable">搜索</el-button>
+          <el-button
+            type="primary"
+            @click="queryTable"
+          >搜索</el-button>
           <el-button @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -25,16 +45,14 @@
               type="primary"
               @click="calce"
               :disabled="!handleSelect.length != 0"
-              >取消盘点</el-button
-            >
+            >取消盘点</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
               type="primary"
               :disabled="!handleSelect.length != 0"
               @click="generateThePlan"
-              >保存</el-button
-            >
+            >执行</el-button>
           </el-col>
         </el-row>
       </div>
@@ -101,21 +119,16 @@
   </div>
 </template>
 <script>
-import { tableConfig } from "./config.js";
-import { list, cancel, entrySave } from "@/api/libraryManage/inventory";
-import { Debounce, getDictLabel } from "@/utils/index";
+import { tableConfig } from './config.js'
+import { list, cancel, entrySave } from '@/api/libraryManage/inventory'
+import { Debounce, getDictLabel } from '@/utils/index'
 export default {
-  name: "",
-  dicts: [
-    "goods_storage_conditions",
-    "goods_classify",
-    "goods_unit",
-    "inv_type_dict",
-  ],
+  name: '',
+  dicts: ['goods_storage_conditions', 'goods_classify', 'goods_unit', 'inv_type_dict'],
   data() {
     return {
       enterForm: {
-        invOrderNo: "",
+        invOrderNo: ''
       },
       selectData: [],
       tableForm: { tableData: [] },
@@ -125,115 +138,98 @@ export default {
       paging: {
         page: 1, // 当前页
         size: 10, // 页面大小
-        total: 0,
-      },
-    };
+        total: 0
+      }
+    }
   },
   mounted() {},
   async created() {
-    this.queryTable();
+    this.queryTable()
 
-    this.tableConfig = await this.getTableHeaderCom(
-      "busin_inventory_add",
-      tableConfig.call(this),
-      "configEntry"
-    );
+    this.tableConfig = await this.getTableHeaderCom('busin_inventory_add', tableConfig.call(this), 'configEntry')
   },
   methods: {
     // 表格的数据
     queryTable() {
       // if (!this.enterForm.invOrderNo) return this.$message("单据编号必填!");
-      this.loading = true;
+      this.loading = true
       list({
-        invWay: "open",
-        ...this.enterForm,
+        invWay: 'open',
+        ...this.enterForm
       })
         .then((response) => {
           if (response.code === 200) {
-            this.loading = false;
-            this.tableForm.tableData = response.rows;
+            this.loading = false
+            this.tableForm.tableData = response.rows
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 表格复选框选中
     handleselection(val) {
-      this.selectData = val;
-      this.handleSelect = val.map((ele) => ele.id);
+      this.selectData = val
+      this.handleSelect = val.map((ele) => ele.id)
     },
     // 重置
     resetQuery() {
-      this.enterForm = {};
+      this.enterForm = {}
     },
     onCalc3(row, prop) {
-      if (row.storageClassify === "0") {
+      if (row.storageClassify === '0') {
         //整散分开
-        if (
-          prop === "invCase" &&
-          Number(row.invCase) !== 0 &&
-          Number(row.invPiece) !== 0
-        ) {
-          this.$message.warning("整件和零散数不能同时录入");
+        if (prop === 'invCase' && Number(row.invCase) !== 0 && Number(row.invPiece) !== 0) {
+          this.$message.warning('整件和零散数不能同时录入')
           // row.invCase = 0;
-        } else if (
-          prop === "invPiece" &&
-          Number(row.invCase) !== 0 &&
-          Number(row.invPiece) !== 0
-        ) {
-          this.$message.warning("整件和零散数不能同时录入");
+        } else if (prop === 'invPiece' && Number(row.invCase) !== 0 && Number(row.invPiece) !== 0) {
+          this.$message.warning('整件和零散数不能同时录入')
           // row.invPiece = 0;
         }
       } else {
         // //整散合一
       }
       // 计算数量(件装量不可输入，只有件数，零散数可以输入。数量是根据件数*件装量+零散数算出来的)
-      const [invCase, invPiece] = [row.invCase || 0, row.invPiece || 0];
-      row.invQty = Math.round(
-        Number(invCase) * Number(row.packageQty) + Number(invPiece)
-      );
+      const [invCase, invPiece] = [row.invCase || 0, row.invPiece || 0]
+      row.invQty = Math.round(Number(invCase) * Number(row.packageQty) + Number(invPiece))
     },
     onCalc2(row) {
       // 算出件数和零散数  件数=数量/包装数 零散数=数量%包装数
-      const [invQty, packageQty] = [row.invQty || 0, row.packageQty || 0];
-      row.invCase = Number(Math.floor(invQty / packageQty)); //向下取整   1.5   1
-      row.invPiece = Number(invQty - packageQty * row.invCase);
+      const [invQty, packageQty] = [row.invQty || 0, row.packageQty || 0]
+      row.invCase = Number(Math.floor(invQty / packageQty)) //向下取整   1.5   1
+      row.invPiece = Number(invQty - packageQty * row.invCase)
     },
     // 部分校验
     validateField(form, index, prop) {
-      let result = true;
+      let result = true
       for (let item of this.$refs[form].fields) {
         if (prop) {
-          if (
-            item.prop.split(".")[1] == index &&
-            item.prop.split(".")[2] !== prop
-          ) {
+          if (item.prop.split('.')[1] == index && item.prop.split('.')[2] !== prop) {
             this.$refs[form].validateField(item.prop, (err) => {
-              if (err != "") {
-                result = false;
+              if (err != '') {
+                result = false
               }
-            });
+            })
           }
         } else {
-          if (item.prop.split(".")[1] == index) {
+          if (item.prop.split('.')[1] == index) {
             this.$refs[form].validateField(item.prop, (err) => {
-              if (err != "") {
-                result = false;
+              if (err != '') {
+                result = false
               }
-            });
+            })
           }
         }
         // if (!result) break;
       }
-      return result;
+      return result
     },
     // 保存
     async generateThePlan() {
-      let arr = [];
+      let arr = []
       this.selectData.forEach((ele, index) => {
-        arr.push(this.validateField("tableForm", index));
-      });
+        arr.push(this.validateField('tableForm', index))
+      })
       if (arr.some((k) => !k)) {
         // 校验的某一行有不通过的就都不通过
       } else {
@@ -241,20 +237,20 @@ export default {
         // let valid2 = this.selectData.some((ele) => Number(ele.invPiece) === 0);
         // let valid3 = this.selectData.some((ele) => Number(ele.invQty) === 0);
         // if (!valid1 && !valid2 && !valid3) {
-        let arr2 = [];
+        let arr2 = []
         this.selectData.forEach((ele, index) => {
           let obj = {
             id: ele.id,
             invQty: ele.invQty,
             invCase: ele.invCase,
-            invPiece: ele.invPiece,
-          };
-          arr2.push(obj);
-        });
+            invPiece: ele.invPiece
+          }
+          arr2.push(obj)
+        })
         // 获取货主ids
-        const { rows } = await entrySave(arr2);
-        this.$message.success("操作成功");
-        this.queryTable();
+        const { rows } = await entrySave(arr2)
+        this.$message.success('操作成功')
+        this.queryTable()
         // } else {
         //   this.$message.warning("必填项不能为0");
         // }
@@ -262,13 +258,13 @@ export default {
     },
     // 取消盘点
     calce() {
-      this.$confirm("是否确认删除所选明细?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确认删除所选明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(async () => {
-        this.remove(this.handleSelect);
-      });
+        this.remove(this.handleSelect)
+      })
     },
     // 取消盘点请求
     remove() {
@@ -276,17 +272,17 @@ export default {
         .then((response) => {
           if (response.code === 200) {
             this.$message({
-              message: "操作成功!",
-              type: "success",
-            });
-            this.queryTable();
+              message: '操作成功!',
+              type: 'success'
+            })
+            this.queryTable()
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
-    },
-  },
-};
+          this.loading = false
+        })
+    }
+  }
+}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped></style>
diff --git a/src/views/libraryManage/inventory/config.js b/src/views/libraryManage/inventory/config.js
index eb20315..a377b47 100644
--- a/src/views/libraryManage/inventory/config.js
+++ b/src/views/libraryManage/inventory/config.js
@@ -66,6 +66,11 @@ export function tableConfig() {
         prop: "specifications",
         istrue: true,
       },
+      {
+        label: "库存数量",
+        prop: "quantity",
+        istrue: true,
+      },
       {
         label: "单位",
         prop: "unit",
@@ -84,26 +89,26 @@ export function tableConfig() {
         type: "index",
         istrue: true,
       },
-      {
-        label: "业主编号",
-        prop: "consignorCode",
-        istrue: true,
-      },
-      {
-        label: "业主名称",
-        prop: "consignorName",
-        istrue: true,
-      },
+      // {
+      //   label: "业主编号",
+      //   prop: "consignorCode",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "业主名称",
+      //   prop: "consignorName",
+      //   istrue: true,
+      // },
       {
         label: "单据编号",
         prop: "invOrderNo",
         istrue: true,
       },
-      {
-        label: "日期",
-        prop: "productionDate",
-        istrue: true,
-      },
+      // {
+      //   label: "日期",
+      //   prop: "productionDate",
+      //   istrue: true,
+      // },
       {
         label: "盘点类型",
         prop: "invType",
@@ -122,31 +127,31 @@ export function tableConfig() {
         prop: "storageName",
         istrue: true,
       },
-      {
-        label: "区域编号",
-        prop: "areaCode",
-        istrue: true,
-      },
-      {
-        label: "产品编号",
-        prop: "goodNo",
-        istrue: true,
-      },
-      {
-        label: "产品名称",
-        prop: "goodName",
-        istrue: true,
-      },
-      {
-        label: "批号",
-        prop: "batchNo",
-        istrue: true,
-      },
-      {
-        label: "产品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+      // {
+      //   label: "区域编号",
+      //   prop: "areaCode",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "产品编号",
+      //   prop: "goodNo",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "产品名称",
+      //   prop: "goodName",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "批号",
+      //   prop: "batchNo",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "产品规格",
+      //   prop: "specifications",
+      //   istrue: true,
+      // },
       {
         label: "包装单位",
         prop: "unit",
@@ -155,21 +160,21 @@ export function tableConfig() {
         //   return getDictLabel(value, _that.dict.type.goods_unit);
         // },
       },
-      {
-        label: "包装数量",
-        prop: "packageQty",
-        istrue: true,
-      },
-      {
-        label: "生产厂家",
-        prop: "factory",
-        istrue: true,
-      },
-      {
-        label: "产地",
-        prop: "waster",
-        istrue: true,
-      },
+      // {
+      //   label: "包装数量",
+      //   prop: "packageQty",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "生产厂家",
+      //   prop: "factory",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "产地",
+      //   prop: "waster",
+      //   istrue: true,
+      // },
       {
         label: "件数",
         prop: "caseQty",
@@ -185,28 +190,28 @@ export function tableConfig() {
       //   prop: "qty",
       //   istrue: true,
       // },
-      {
-        label: "实盘件数",
-        prop: "invCase",
-        istrue: true,
-        type: "slot",
-        slotName: "invCase",
-      },
-      {
-        label: "实盘零散数",
-        prop: "invPiece",
-        istrue: true,
-        type: "slot",
-        slotName: "invPiece",
-        "min-width": 120,
-      },
-      {
-        label: "实盘数量",
-        prop: "invQty",
-        istrue: true,
-        type: "slot",
-        slotName: "invQty",
-      },
+      // {
+      //   label: "实盘件数",
+      //   prop: "invCase",
+      //   istrue: true,
+      //   type: "slot",
+      //   slotName: "invCase",
+      // },
+      // {
+      //   label: "实盘零散数",
+      //   prop: "invPiece",
+      //   istrue: true,
+      //   type: "slot",
+      //   slotName: "invPiece",
+      //   "min-width": 120,
+      // },
+      // {
+      //   label: "实盘数量",
+      //   prop: "invQty",
+      //   istrue: true,
+      //   type: "slot",
+      //   slotName: "invQty",
+      // },
     ],
     rulesEntry: {
       invCase: [
@@ -232,21 +237,21 @@ export function tableConfig() {
         prop: "consignorCode",
         istrue: true,
       },
-      {
-        label: "业主名称",
-        prop: "consignorName",
-        istrue: true,
-      },
-      {
-        label: "单据编号",
-        prop: "invOrderNo",
-        istrue: true,
-      },
-      {
-        label: "日期",
-        prop: "productionDate",
-        istrue: true,
-      },
+      // {
+      //   label: "业主名称",
+      //   prop: "consignorName",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "单据编号",
+      //   prop: "invOrderNo",
+      //   istrue: true,
+      // },
+      // {
+      //   label: "日期",
+      //   prop: "productionDate",
+      //   istrue: true,
+      // },
       {
         label: "盘点类型",
         prop: "invType",
diff --git a/src/views/libraryManage/inventory/inventory.vue b/src/views/libraryManage/inventory/inventory.vue
index 335df7f..5b18c5a 100644
--- a/src/views/libraryManage/inventory/inventory.vue
+++ b/src/views/libraryManage/inventory/inventory.vue
@@ -161,7 +161,7 @@ export default {
         storageId: '',
         areaId: '',
         locationCode: '',
-        invWay: 'close',
+        invWay: '',
         invType: ''
       },
       options: [],
@@ -236,6 +236,7 @@ export default {
     // 表格复选框选中
     handleselection(val) {
       this.handleSelect = val.map((ele) => ele.id)
+      // this.ids = val.map((ele) => ele.stockId)
       this.ids = val.map((ele) => ele.stockId)
     },
     // 重置
@@ -245,7 +246,7 @@ export default {
     // 表格的数据
     queryTable() {
       // if (!this.enterForm.consignorId) return this.$message('业主名称必填!')
-      if (!this.enterForm.invWay) return this.$message('盘点方式必选!')
+      // if (!this.enterForm.invWay) return this.$message('盘点方式必选!')
       // if (!this.enterForm.invType) return this.$message('盘点类型必选!')
       this.loading = true
       queryGoods({
diff --git a/src/views/libraryManage/lockOutStore/index.vue b/src/views/libraryManage/lockOutStore/index.vue
index 67e3587..4839a4c 100644
--- a/src/views/libraryManage/lockOutStore/index.vue
+++ b/src/views/libraryManage/lockOutStore/index.vue
@@ -7,28 +7,6 @@
       label-width="68px"
     >
 
-      <el-form-item
-        label="机种"
-        prop="ptBreakCat"
-        style="width: 220px;"
-      >
-
-        <el-select
-          v-model="queryParams.ptBreakCat"
-          style="width:150px"
-          placeholder="请选择"
-          clearable
-        >
-          <el-option
-            v-for="item in BreakCatList"
-            :key="item"
-            :label="item"
-            :value="item"
-          >
-          </el-option>
-        </el-select>
-
-      </el-form-item>
       <el-form-item
         label="物料编号"
         prop="ptPart"
@@ -92,6 +70,7 @@
         @handleUpdate="handleUpdate"
         @handleselection="handleselection"
         @handleDetail="handleDetail"
+        style="margin-top:50px"
       >
       </heavy-table>
     </div>
@@ -233,49 +212,48 @@ export default {
           istrue: true
         },
         {
-          label: '锁定批次',
-          prop: 'batch',
+          label: '锁定批号',
+          prop: 'batchNo',
           istrue: true
         },
         {
-          label: '机种',
-          prop: 'ptBreakCat',
-          width: '120px',
-          istrue: true
-        },
-        {
-          label: '物料号',
-          prop: 'ptPart',
+          label: '商品编号',
+          prop: 'goodNo',
           istrue: true,
           width: '200px'
         },
         {
-          label: '物料名称',
-          prop: 'ptName',
+          label: '深位',
+          prop: 'isDeep',
+          istrue: true
+        },
+        {
+          label: '商品名称',
+          prop: 'goodName',
           istrue: true,
           width: '200px'
         },
         {
-          label: '锁定车数',
-          prop: 'containers',
+          label: '商品规格',
+          prop: 'specifications',
           istrue: true
         },
 
         {
-          label: '锁定数量',
-          prop: 'qty',
+          label: '单位',
+          prop: 'unit',
           istrue: true,
           width: '160px'
         },
         {
-          label: '已出库车数',
-          prop: 'outContainers',
+          label: '出库货位',
+          prop: 'locationName',
           istrue: true,
           width: '160px'
         },
         {
           label: '已出库数量',
-          prop: 'outqty',
+          prop: 'outQty',
           istrue: true,
           width: '160px'
         },
@@ -321,7 +299,7 @@ export default {
       //导出属性
       jsonFields: {},
       // 遮罩层
-      loading: true,
+      loading: false,
       //日期范围
       dateRange: '',
       // 显示搜索条件
@@ -403,7 +381,7 @@ export default {
     },
     /** 查询区域列表 */
     getList() {
-      this.loading = true
+      // this.loading = true
       getLockstockOutList(this.queryParams).then((response) => {
         this.waitForLockList = response.rows
         this.paging.total = response.total