库存信息页面韩式 查询修改 导出修改

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

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询库存信息列表
 export function listManagement(query) {
   return request({
-    url: '/out/handAllotStock/list',
+    url: '/stock/management/list',
     method: 'get',
     params: query
   })

ruoyi-ui/src/views/in/job/index.vue

@@ -313,7 +313,7 @@ export default {
   created() {
     // 获取字典数据后，设置默认值
     this.getList()
-    //this.getWarehouseList()
+    this.getWarehouseList()
   },
   methods: {
     /** 获取仓库列表 */

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

@@ -1,55 +1,221 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="库存ID" prop="stockId"><!-- 库存id -->
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入库存ID"
+      <el-form-item label="仓库" prop="warehouseId"><!--仓库-->
+        <el-select
+          v-model="queryParams.warehouseId"
+          placeholder="请选择仓库"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="货位编码" prop="cargoSpaceId"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.cargoSpaceName"
-          placeholder="请输入货位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
-        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
+          @change="handleQuery"
+        >
           <el-option
-            v-for="dict in dict.type.stock_status"
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="spec">
+        <el-input
+          v-model="queryParams.spec"
+          placeholder="请输入规格型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="常用编码" prop="parentId">
+        <el-input
+          v-model="queryParams.parentId"
+          placeholder="请输入常用编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应代号" prop="supplierId">
+        <el-input
+          v-model="queryParams.supplierId"
+          placeholder="请输入供应商代号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="供应名称" prop="supplierName">
+        <el-input
+          v-model="queryParams.supplierName"
+          placeholder="请输入供应商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库单号" prop="stockinId">
+        <el-input
+          v-model="queryParams.stockinId"
+          placeholder="请输入入库单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单价" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入单价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="托盘号" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同号" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入合同号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用途" prop="spare4">
+        <el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
+          <el-option
+            v-for="dict in dict.type.purpose_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-
-<!--      <el-form-item label="入库时间" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;
+      <el-form-item label="起始时间" prop="inDateStart">
         <el-date-picker clearable
-                        v-model="queryParams.inDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择入库时间">
+                        v-model="queryParams.inDateStart"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择起始时间">
         </el-date-picker>
-      </el-form-item>-->
-
-
-      <el-form-item label="物料名称" prop="productName"><!-- 物料描述 -->
+      </el-form-item>
+      <el-form-item label="截止日期" prop="inDateEnd">
+        <el-date-picker clearable
+                        v-model="queryParams.inDateEnd"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择截止时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="周转类型" prop="voltage">
+        <el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
+          <el-option
+            v-for="dict in dict.type.turnover_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源" prop="spare1">
+        <el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
+          <el-option
+            v-for="dict in dict.type.origin_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="套账" prop="spare3">
+        <el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
+          <el-option
+            v-for="dict in dict.type.account_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="形态类型" prop="productType">
+        <el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
+          <el-option
+            v-for="dict in dict.type.product_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="台次" prop="spare5">
         <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          v-model="queryParams.spare5"
+          placeholder="请输入台次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="件次" prop="power">
+        <el-input
+          v-model="queryParams.power"
+          placeholder="请输入件次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="库外" prop="outside">
+        <el-input
+          v-model="queryParams.outside"
+          placeholder="请输入库外"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -101,36 +267,54 @@
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" align="center" />
       <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
       <el-table-column label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="订单号" align="center" prop="orderId" width="160"/>
-      <el-table-column label="入库时间" align="center" prop="inDate" width="160"/>
-      <el-table-column label="数量" align="center" prop="quantity" />
-      <el-table-column label="作业编码" align="center" prop="jobId" width="160"/>
-      <el-table-column label="出库数量" align="center" prop="outQuantity" />
-      <el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
+      <el-table-column label="套账" align="center" prop="spare3">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
+      <el-table-column label="托盘" align="center" prop="trayCode"/>
+      <el-table-column label="产品编码" align="center" prop="productId"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="160" />
+      <el-table-column label="规格" align="center" prop="spec" width="160"/>
+      <el-table-column label="数量" align="center" prop="quantity"/>
+      <el-table-column label="单价" align="center" prop="price"/>
+      <el-table-column label="金额" align="center" prop="spare6"/>
+      <el-table-column label="产品状态" align="center" prop="spare1">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" align="center" prop="unit"/>
+      <el-table-column label="图号" align="center" prop="cargoNo"/>
+      <el-table-column label="合同号" align="center" prop="orderId"/>
+      <el-table-column label="台次" align="center" prop="spare5"/>
+      <el-table-column label="件次" align="center" prop="power"/>
+      <el-table-column label="质量" align="center" prop="spare8">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="常用编码" align="center" prop="parentId"/>
       <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
-<!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
-<!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column label="规格" align="center" prop="spare1" />
-      <el-table-column label="单位" align="center" prop="spare3" />
-      <el-table-column label="型号" align="center" prop="spare4" />
-      <el-table-column label="颜色" align="center" prop="spare5" />
-      <el-table-column label="序列号" align="center" prop="spare6" />
-      <el-table-column label="电压" align="center" prop="voltage" />
-      <el-table-column label="功率" align="center" prop="power" />
-      <el-table-column label="相位" align="center" prop="phase" />
-      <el-table-column label="净重" align="center" prop="netWeight" />
-      <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="分销" align="center" prop="distribution" />
-      <el-table-column label="机型" align="center" prop="model" />
+      <el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>
+      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
+      <el-table-column label="仓库编码" align="center" prop="warehouseId"/>
+      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
+      <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
+      <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
+      <el-table-column label="盘点标识" align="center" prop="spare7">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
           <el-button
@@ -342,13 +526,14 @@
 </template>
 
 <script>
-import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
+import {addManagement, delManagement, getManagement, listManagement, updateManagement} from "@/api/stock/management"
 import {listWarehouse} from "@/api/bas/warehouse"
-import { listBasProduct } from "@/api/bas/BasProduct"
-import { listCargoSpace } from "@/api/bas/cargoSpace"
+import {listBasProduct} from "@/api/bas/BasProduct"
+import {listCargoSpace} from "@/api/bas/cargoSpace"
+
 export default {
   name: "Management",
-  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
+  dicts: ['product_status','check_flag', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type'],
   data() {
     return {
       // 遮罩层
@@ -399,7 +584,8 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null
+        spare6: null,
+        theFloor: null,
       },
       queryWarehouse: {
         pageNum:1,