Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java

@@ -16,7 +16,7 @@ public class StockSummary extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 序号 */
-    @Excel(name = "序号")
+//    @Excel(name = "序号")
     private Long onlyIdentity;
 
     /** 物料编码 */

ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java

@@ -2,6 +2,8 @@ package com.ruoyi.search.ViewFlatWarehouseInFlow.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.BaseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -114,7 +116,7 @@ public class ViewFlatWarehouseInFlowController extends BaseController
     @GetMapping("/warehouseList")
     public TableDataInfo warehouseList()
     {
-        startPage();
+//        startPage();
         BasWarehouse basWarehouse = new BasWarehouse();
         basWarehouse.setWarehouseType("3");
         List<BasWarehouse> list = basWarehouseService.selectBasWarehouseList(basWarehouse);

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java

@@ -20,6 +20,10 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "出库单号")
     private String stockoutId;
 
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
     /** 出库类型 */
     @Excel(name = "出库类型")
     private String outType;
@@ -124,6 +128,14 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
     public String getPrice() {
         return price;
     }
@@ -384,6 +396,7 @@ public class ViewStockoutHistory extends BaseEntity
     public String toString() {
         return "ViewStockoutHistory{" +
                 "stockoutId='" + stockoutId + '\'' +
+                ", warehouseId='" + warehouseId + '\'' +
                 ", outType='" + outType + '\'' +
                 ", createDate='" + createDate + '\'' +
                 ", createManId='" + createManId + '\'' +

ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml

@@ -44,7 +44,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <if test="groupByRoadwayId != null and groupByRoadwayId">s.cargo_space_id as roadway_id,</if>
                     SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
                     FROM bas_stock s
-                    LEFT JOIN bas_product p ON s.product_guid = p.product_guid
+                    LEFT JOIN bas_product p ON s.product_id = p.product_id
+                    <where>
+                        <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
+                        <if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
+                        <if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id like concat('%', #{roadwayId}, '%')</if>
+                        <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                            ${params.warehouseDataScope}
+                        </if>
+                    </where>
                     GROUP BY
                     <trim prefixOverrides=",">
                         <if test="groupByProductId != null and groupByProductId">,p.product_id</if>
@@ -52,12 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="groupBySpec != null and groupBySpec">,p.spec</if>
                         <if test="groupByUnit != null and groupByUnit">,p.unit</if>
                         <if test="groupByPrice != null and groupByPrice">,p.price</if>
-                        <if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
+                        <if test="groupBySpare1 != null and groupBySpare1">,p.spare1</if>
-                        <if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
+                        <if test="groupBySpare2 != null and groupBySpare2">,p.spare2</if>
-                        <if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
+                        <if test="groupBySpare5 != null and groupBySpare5">,p.spare5</if>
-                        <if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
+                        <if test="groupBySpare6 != null and groupBySpare6">,p.spare6</if>
-                        <if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
+                        <if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
-                        <if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
+                        <if test="groupBySpare7 != null and groupBySpare7">,p.spare7</if>
                         <if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
                         <if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
                         <if test="groupByRoadwayId != null and groupByRoadwayId">,s.cargo_space_id</if>
@@ -67,30 +87,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     1 as group_all,
                     SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
                     FROM bas_stock s
-                    LEFT JOIN bas_product p ON s.product_guid = p.product_guid
+                    LEFT JOIN bas_product p ON s.product_id = p.product_id
+                    <where>
+                        <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
+                        <if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
+                        <if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id like concat('%', #{roadwayId}, '%')</if>
+                        <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                            ${params.warehouseDataScope}
+                        </if>
+                    </where>
                 </otherwise>
             </choose>
     </sql>
 
     <select id="selectStockSummaryList" parameterType="StockSummary" resultMap="StockSummaryResult">
         <include refid="selectStockSummaryVo"/>
-        <where>
-            <if test="productId != null and productId != ''"> AND p.product_id = #{productId}</if>
-            <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null and spec != ''"> AND p.spec = #{spec}</if>
-            <if test="unit != null and unit != ''"> AND p.unit = #{unit}</if>
-            <if test="price != null and price != ''"> AND p.price = #{price}</if>
-            <if test="spare1 != null and spare1 != ''"> AND p.spare1 = #{spare1}</if>
-            <if test="spare2 != null and spare2 != ''"> AND p.spare2 = #{spare2}</if>
-            <if test="spare5 != null and spare5 != ''"> AND p.spare5 = #{spare5}</if>
-            <if test="spare6 != null and spare6 != ''"> AND p.spare6 = #{spare6}</if>
-            <if test="spare8 != null and spare8 != ''"> AND p.spare8 = #{spare8}</if>
-            <if test="spare7 != null and spare7 != ''"> AND p.spare7 = #{spare7}</if>
-            <if test="remark != null and remark != ''"> AND p.spare7 = #{remark}</if>
-            <if test="lotNo != null and lotNo != ''"> AND s.lot_no = #{lotNo}</if>
-            <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id = #{warehouseId}</if>
-            <if test="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id = #{roadwayId}</if>
-        </where>
     </select>
     
     <select id="selectStockSummaryByOnlyIdentity" parameterType="Long" resultMap="StockSummaryResult">

ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml

@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml

@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml

@@ -87,6 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml

@@ -91,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml

@@ -118,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml

@@ -118,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml

@@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
         <result property="stockoutId"    column="stockout_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
         <result property="outType"    column="out_type"    />
         <result property="createDate"    column="create_date"    />
         <result property="createManId"    column="create_man_id"    />
@@ -35,13 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockoutHistoryVo">
-        select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history
+        select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
         <include refid="selectViewStockoutHistoryVo"/>
         <where>
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
             <if test="outType != null  and outType != ''"> and out_type = #{outType}</if>
             <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
             <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
@@ -67,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
     

ruoyi-ui/src/api/search/ViewInJobFlow.js

@@ -1,5 +1,11 @@
 import request from '@/utils/request'
-
+// 查询仓库列表
+export function warehouseList() {
+  return request({
+    url: '/bas/warehouse/list',
+    method: 'get'
+  })
+}
 // 查询入库作业流水列表
 export function listViewInJobFlow(query) {
   return request({

ruoyi-ui/src/lang/en.js

@@ -1,5 +1,39 @@
 // en.js
 export default {
+  viewsMain: {
+    systemTitle: 'Fortucky Management System',
+    title: 'Home',
+    inboundOrders: 'Inbound Orders',
+    outboundOrders: 'Outbound Orders',
+    inventoryOrders: 'Inventory Orders',
+    totalOrders: 'Total Orders',
+    weeklyStats: 'Weekly In/Out Statistics',
+    locationStats: 'Location Statistics',
+    documentList: 'Document List',
+    documentId: 'Document ID',
+    type: 'Type',
+    status: 'Status',
+    executingTasks: 'Executing Tasks',
+    taskId: 'Task ID',
+    pendingTasks: 'Pending Tasks',
+    priority: 'Priority',
+    // Document Types
+    inbound: 'Inbound',
+    outbound: 'Outbound',
+    inventory: 'Inventory',
+    // Document Status
+    unexecuted: 'Unexecuted',
+    reviewing: 'Reviewing',
+    executing: 'Executing',
+
+    emptyLocation:"emptyLocation",
+    fullLocation:"fullLocation",
+    inboundAllocated:"inboundAllocated",
+    outboundAllocated:"outboundAllocated",
+    inboundNeedCheck:"inboundNeedCheck",
+    outboundNeedCheck:"outboundNeedCheck",
+  },
+
 
   login: {
     title: 'FORTUCKY WMS SYSTEM',
@@ -628,23 +662,7 @@ export default {
 
   },
 
-  viewsMain: {
+
-    systemTitle: 'RuoYi Admin',
-    title: 'homePage',
-    unfinishedInboundTask: 'Unfinished Inbound Task Overview',
-    taskKey: 'Task Key',
-    unfinishedInboundTaskName: 'Unfinished Inbound Task',
-    totalUnfinishedCount: 'Total Unfinished Count',
-    todayUnfinishedCount: 'Today Unfinished Count',
-    finishedInboundTask: 'Finished Inbound Task Overview',
-    finishedInboundTaskName: 'Finished Inbound Task',
-    totalFinishedCount: 'Total Finished Count',
-    todayFinishedCount: 'Today Finished Count',
-    unfinishedOutboundTask: 'Unfinished Outbound Task Overview',
-    unfinishedOutboundTaskName: 'Unfinished Outbound Task',
-    finishedOutboundTask: 'Finished Outbound Task Overview',
-    finishedOutboundTaskName: 'Finished Outbound Task'
-  },
 
   searchViewStockSecure: {
     stockId: 'Stock ID',

ruoyi-ui/src/lang/zh.js

@@ -635,23 +635,7 @@ export default {
 
   },
 
-  viewsMain: {
+
-    systemTitle: '福莱瑞达管理系统',
-    title: '首页',
-    unfinishedInboundTask: '未完成入库任务概览',
-    taskKey: '任务键值',
-    unfinishedInboundTaskName: '未完成入库任务',
-    totalUnfinishedCount: '全部未完成数量',
-    todayUnfinishedCount: '今日未完成数量',
-    finishedInboundTask: '已完成入库任务概览',
-    finishedInboundTaskName: '已完成入库任务',
-    totalFinishedCount: '全部已完成数量',
-    todayFinishedCount: '今日已完成数量',
-    unfinishedOutboundTask: '未完成出库任务概览',
-    unfinishedOutboundTaskName: '未完成出库任务',
-    finishedOutboundTask: '已完成出库任务概览',
-    finishedOutboundTaskName: '已完成出库任务'
-  },
 
   searchViewStockSecure: {
     stockId: '库存ID',
@@ -3174,5 +3158,38 @@ export default {
     editSuccess: '修改成功',
     deleteSuccess: '删除成功',
     deleteConfirm: '是否确认删除客户编号为"{ids}"的数据项？'
+  },
+  viewsMain: {
+    systemTitle: '福莱瑞达管理系统',
+    title: '首页',
+    inboundOrders: '入库单数',
+    outboundOrders: '出库单数',
+    inventoryOrders: '盘点单数',
+    totalOrders: '总单据数',
+    weeklyStats: '近一周入库出库统计',
+    locationStats: '库位统计',
+    documentList: '单据列表',
+    documentId: '单据编号',
+    type: '类型',
+    status: '状态',
+    executingTasks: '正执行任务',
+    taskId: '任务编号',
+    pendingTasks: '待执行任务',
+    priority: '优先级',
+    // 单据类型
+    inbound: '入库',
+    outbound: '出库',
+    inventory: '盘点',
+    // 单据状态
+    unexecuted: '未执行',
+    reviewing: '审核中',
+    executing: '正执行',
+    // 饼图
+    emptyLocation:"空货位",
+    fullLocation:"满货位",
+    inboundAllocated:"入库已分配",
+    outboundAllocated:"出库已分配",
+    inboundNeedCheck:"入库需盘点",
+    outboundNeedCheck:"出库需盘点",
   }
 }

ruoyi-ui/src/views/index.vue

@@ -8,7 +8,7 @@
             <svg-icon icon-class="clipboard" class-name="card-panel-icon"/>
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">入库单数</div>
+            <div class="card-panel-text">{{ $t('viewsMain.inboundOrders') }}</div> <!-- 入库单数 -->
             <count-to :start-val="0" :end-val="Number(quantity.inbound_order) || 0" :duration="2600" class="card-panel-num"/>
           </div>
         </div>
@@ -19,7 +19,7 @@
             <svg-icon icon-class="documentation" class-name="card-panel-icon"/>
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">出库单数</div>
+            <div class="card-panel-text">{{ $t('viewsMain.outboundOrders') }}</div> <!-- 出库单数 -->
             <count-to :start-val="0" :end-val="Number(quantity.outbound_order) || 0" :duration="3000" class="card-panel-num"/>
           </div>
         </div>
@@ -30,8 +30,8 @@
             <svg-icon icon-class="chart" class-name="card-panel-icon"/>
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">盘点单数</div>
+            <div class="card-panel-text">{{ $t('viewsMain.inventoryOrders') }}</div> <!-- 盘点单数 -->
-            <count-to :start-val="0" :end-val="Number(quantity.inbound_order)|| 0" :duration="3200" class="card-panel-num"/>
+            <count-to :start-val="0" :end-val="Number(quantity.inventory_sheet)|| 0" :duration="3200" class="card-panel-num"/>
           </div>
         </div>
       </el-col>
@@ -41,7 +41,7 @@
             <svg-icon icon-class="excel" class-name="card-panel-icon"/>
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">总单据数</div>
+            <div class="card-panel-text">{{ $t('viewsMain.totalOrders') }}</div> <!-- 总单据数 -->
             <count-to :start-val="0" :end-val="Number(quantity.total_documents)|| 0" :duration="3600" class="card-panel-num"/>
           </div>
         </div>
@@ -53,7 +53,7 @@
       <el-col :xs="24" :sm="24" :lg="16">
         <div class="chart-wrapper">
           <div class="chart-header">
-            <span>近一周入库出库统计</span>
+            <span>{{ $t('viewsMain.weeklyStats') }}</span> <!-- 近一周入库出库统计 -->
           </div>
           <line-chart :chart-data="lineChartData"/>
         </div>
@@ -61,7 +61,7 @@
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
           <div class="chart-header">
-            <span>库位统计</span>
+            <span>{{ $t('viewsMain.locationStats') }}</span> <!-- 库位统计 -->
           </div>
           <pie-chart :chart-data="pieChartData"/>
         </div>
@@ -73,39 +73,39 @@
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="list-wrapper">
           <div class="list-header">
-            <span>单据列表</span>
+            <span>{{ $t('viewsMain.documentList') }}</span> <!-- 单据列表 -->
           </div>
           <el-table :data="documentList" style="width: 100%" size="mini" height="300"
                     :header-cell-style="{backgroundColor: '#f5f7fa'}">
-            <el-table-column prop="id" label="单据编号"/>
+            <el-table-column prop="id" :label="$t('viewsMain.documentId')"/> <!-- 单据编号 -->
-            <el-table-column prop="type" :formatter="type_" label="类型" width="80"/>
+            <el-table-column prop="type" :formatter="type_" :label="$t('viewsMain.type')" width="80"/> <!-- 类型 -->
-            <el-table-column prop="status" :formatter="status_" label="状态" width="80"/>
+            <el-table-column prop="status" :formatter="status_" :label="$t('viewsMain.status')" width="80"/> <!-- 状态 -->
           </el-table>
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="list-wrapper">
           <div class="list-header">
-            <span>正执行任务</span>
+            <span>{{ $t('viewsMain.executingTasks') }}</span> <!-- 正执行任务 -->
           </div>
           <el-table :data="executingTasks" style="width: 100%" size="mini" height="300"
                     :header-cell-style="{backgroundColor: '#f5f7fa'}">
-            <el-table-column prop="jobId" label="任务编号"/>
+            <el-table-column prop="jobId" :label="$t('viewsMain.taskId')"/> <!-- 任务编号 -->
-            <el-table-column prop="inOrOut" label="类型" width="80"/>
+            <el-table-column prop="inOrOut" :label="$t('viewsMain.type')" width="80"/> <!-- 类型 -->
-            <el-table-column prop="statusLabel" label="状态" width="80"/>
+            <el-table-column prop="statusLabel" :label="$t('viewsMain.status')" width="80"/> <!-- 状态 -->
           </el-table>
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="list-wrapper">
           <div class="list-header">
-            <span>待执行任务</span>
+            <span>{{ $t('viewsMain.pendingTasks') }}</span> <!-- 待执行任务 -->
           </div>
           <el-table :data="pendingTasks" style="width: 100%" size="mini" height="300"
                     :header-cell-style="{backgroundColor: '#f5f7fa'}">
-            <el-table-column prop="jobId" label="任务编号"/>
+            <el-table-column prop="jobId" :label="$t('viewsMain.taskId')"/> <!-- 任务编号 -->
-            <el-table-column prop="inOrOut" label="类型" width="80"/>
+            <el-table-column prop="inOrOut" :label="$t('viewsMain.type')" width="80"/> <!-- 类型 -->
-            <el-table-column prop="priority" label="优先级" width="80"/>
+            <el-table-column prop="priority" :label="$t('viewsMain.priority')" width="80"/> <!-- 优先级 -->
           </el-table>
         </div>
       </el-col>
@@ -140,7 +140,14 @@ export default {
         actualData: []
       },
       pieChartData: {
-        labels: ['空货位', '满货位', '入库已分配', '出库已分配', '入库需盘点', '出库需盘点'],
+        labels: [
+          this.$t('viewsMain.emptyLocation'), // 空货位
+          this.$t('viewsMain.fullLocation'), // 满货位
+          this.$t('viewsMain.inboundAllocated'), // 入库已分配
+          this.$t('viewsMain.outboundAllocated'), // 出库已分配
+          this.$t('viewsMain.inboundNeedCheck'), // 入库需盘点
+          this.$t('viewsMain.outboundNeedCheck') // 出库需盘点
+        ],
         datasets: [{
           data: [],
           backgroundColor: ['#36f7c4', '#ffc240', '#34bfa3', '#ff5f5f', '#ffd700', '#c669cd']
@@ -168,10 +175,11 @@ export default {
     getListData() {
       // 所有单据数量
       finishCount().then(response => {
+        console.log(response)
         this.quantity.inbound_order = response.data.stockinCount
         this.quantity.outbound_order = response.data.stockoutCount
         this.quantity.inventory_sheet = response.data.stockcheckCount
-        this.quantity.total_documents = response.data.stockinCount + response.data.stockoutCount + response.data.stockcheckCount
+        this.quantity.total_documents = Number(response.data.stockinCount) + Number(response.data.stockoutCount) + Number(response.data.stockcheckCount)
       })
       // 周入库出库作业
       weekjob().then(response => {
@@ -196,22 +204,22 @@ export default {
     type_(row, column) {
       const type = row.type
       if (type == 1) {
-        return "入库"
+        return this.$t('viewsMain.inbound') // 入库
       } else if (type == 2) {
-        return "出库"
+        return this.$t('viewsMain.outbound') // 出库
       } else if (type == 3) {
-        return "盘点"
+        return this.$t('viewsMain.inventory') // 盘点
       }
       return ""
     },
     status_(row, column) {
       const status = row.status
       if (status == 1) {
-        return "未执行"
+        return this.$t('viewsMain.unexecuted') // 未执行
       } else if (status == 2) {
-        return "审核中"
+        return this.$t('viewsMain.reviewing') // 审核中
       } else if (status == 3) {
-        return "正执行"
+        return this.$t('viewsMain.executing') // 正执行
       }
       return ""
     }

ruoyi-ui/src/views/kpi/inAnalysis/index.vue

@@ -84,7 +84,11 @@ export default {
     /** 查询仓库列表 */
     getWarehouseList() {
       // TODO: 调用获取仓库列表接口
-      listWarehouse().then(response => {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
         this.warehouseOptions = response.rows;
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];

ruoyi-ui/src/views/kpi/outAnalysis/index.vue

@@ -84,7 +84,11 @@ export default {
     /** 查询仓库列表 */
     getWarehouseList() {
       // TODO: 调用获取仓库列表接口
-      listWarehouse().then(response => {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
         this.warehouseOptions = response.rows;
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];

ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue

@@ -97,7 +97,11 @@ export default {
     /** 查询仓库列表 */
     getWarehouseList() {
       // TODO: 调用获取仓库列表接口
-      listWarehouse().then(response => {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
         this.warehouseOptions = response.rows;
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];

ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue

@@ -72,7 +72,11 @@ export default {
     /** 查询仓库列表 */
     getWarehouseList() {
       // TODO: 调用获取仓库列表接口
-      listWarehouse().then(response => {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
         this.warehouseOptions = response.rows;
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];

ruoyi-ui/src/views/search/StockSummary/index.vue

@@ -1,6 +1,35 @@
 <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="分组选项">
+        <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
+          <el-checkbox label="productId">物料编码</el-checkbox>
+          <el-checkbox label="productName">物料名称</el-checkbox>
+          <el-checkbox label="spec">规格</el-checkbox>
+          <el-checkbox label="unit">单位</el-checkbox>
+          <el-checkbox label="lotNo">批号</el-checkbox>
+          <el-checkbox label="warehouseId">仓库</el-checkbox>
+          <el-checkbox label="roadwayId">巷道</el-checkbox>
+          <el-checkbox label="price">价格</el-checkbox>
+          <el-checkbox label="spare1">英文名称</el-checkbox>
+          <el-checkbox label="spare2">单件净重</el-checkbox>
+          <el-checkbox label="spare5">长度</el-checkbox>
+          <el-checkbox label="spare6">宽度</el-checkbox>
+          <el-checkbox label="spare7">高度</el-checkbox>
+          <el-checkbox label="spare8">体积</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <br>
+      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('searchStockSummary.productId')" prop="productId"> <!-- 物料编码 -->
         <el-input
           v-model="queryParams.productId"
@@ -33,14 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchStockSummary.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
-        <el-input
-          v-model="queryParams.warehouseId"
-          :placeholder="$t('searchStockSummary.inputWarehouseId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('searchStockSummary.roadwayId')" prop="roadwayId"> <!-- 巷道 -->
         <el-input
           v-model="queryParams.roadwayId"
@@ -75,21 +96,21 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" /> <!-- 物料编码 -->
+      <el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
-      <el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
+      <el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
-      <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" /> <!-- 规格 -->
+      <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" v-if="queryParams.groupFields.includes('spec')" /> <!-- 规格 -->
-      <el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" /> <!-- 单位 -->
+      <el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
-      <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
+      <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" v-if="queryParams.groupFields.includes('lotNo')" /> <!-- 批号 -->
-      <el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
+      <el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
-      <el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道 -->
+      <el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" v-if="queryParams.groupFields.includes('roadwayId')" /> <!-- 巷道 -->
       <el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
-      <el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
+      <el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
-      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
+      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
-      <el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
+      <el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
-      <el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
+      <el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
-      <el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
+      <el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
-      <el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
+      <el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
-      <el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
+      <el-table-column :label="$t('basproduct1.price')" align="center" prop="price" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
       <el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
     </el-table>
 
@@ -104,28 +125,31 @@
 </template>
 
 <script>
-  import { listStockSummary, getStockSummary } from "@/api/search/StockSummary";
+import { listStockSummary, getStockSummary } from "@/api/search/StockSummary";
+import { listWarehouse } from "@/api/bas/warehouse"
 
-  export default {
+export default {
-    name: "StockSummary",
+  name: "StockSummary",
-    data() {
+  data() {
-      return {
+    return {
-        // 遮罩层
+      // 遮罩层
-        loading: true,
+      loading: true,
-        // 选中数组
+      // 仓库选项
-        ids: [],
+      warehouseOptions: [],
-        // 非单个禁用
+      // 选中数组
-        single: true,
+      ids: [],
-        // 非多个禁用
+      // 非单个禁用
-        multiple: true,
+      single: true,
-        // 显示搜索条件
+      // 非多个禁用
-        showSearch: true,
+      multiple: true,
-        // 总条数
+      // 显示搜索条件
-        total: 0,
+      showSearch: true,
-        // 库存汇总表格数据
+      // 总条数
-        stockSummaryList: [],
+      total: 0,
-        // 查询参数
+      // 库存汇总表格数据
-        queryParams: {
+      stockSummaryList: [],
+      // 查询参数
+      queryParams: {
         pageNum: 1,
         pageSize: 10,
         productId: null,
@@ -137,45 +161,90 @@
         roadwayId: null,
         quantity: null,
         //分组字段
-        groupFields: ['productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId']
+        groupFields: []
       }
-      };
+    };
+  },
+  created() {
+    // 初始化时全选分组选项
+    this.queryParams.groupFields = [
+      'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
+      'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
+    ];
+    this.getList();
+    this.getWarehouseList()
+  },
+  methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
     },
-    created() {
+    /** 查询库存汇总列表 */
+    getList() {
+      this.loading = true;
+      // 将选中的分组字段转换为后端需要的格式
+      const params = {};
+      // 先设置查询条件
+      Object.keys(this.queryParams).forEach(key => {
+        if (key !== 'groupFields' && this.queryParams[key] !== null) {
+          params[key] = this.queryParams[key];
+        }
+      });
+      // 再设置分组字段
+      this.queryParams.groupFields.forEach(field => {
+        params[`groupBy${field.charAt(0).toUpperCase() + field.slice(1)}`] = true;
+      });
+
+      listStockSummary(params).then(response => {
+        this.stockSummaryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    methods: {
+    /** 重置按钮操作 */
-      /** 查询库存汇总列表 */
+    resetQuery() {
-      getList() {
+      this.resetForm("queryForm");
-        this.loading = true;
+      // 重置时恢复全选状态
-        listStockSummary(this.queryParams).then(response => {
+      this.queryParams.groupFields = [
-          this.stockSummaryList = response.rows;
+        'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
-          this.total = response.total;
+        'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
-          this.loading = false;
+      ];
-        });
+      this.handleQuery();
-      },
+    },
-      /** 搜索按钮操作 */
+    /** 导出按钮操作 */
-      handleQuery() {
+    handleExport() {
-        this.queryParams.pageNum = 1;
+      // 将选中的分组字段转换为后端需要的格式
-        this.getList();
+      const params = {};
-      },
+      // 先设置查询条件
-      /** 重置按钮操作 */
+      Object.keys(this.queryParams).forEach(key => {
-      resetQuery() {
+        if (key !== 'groupFields' && this.queryParams[key] !== null) {
-        this.resetForm("queryForm");
+          params[key] = this.queryParams[key];
-        this.handleQuery();
+        }
-      },
+      });
-      /** 导出按钮操作 */
+      // 再设置分组字段
-      handleExport() {
+      this.queryParams.groupFields.forEach(field => {
-        this.download('search/StockSummary/export', {
+        params[`groupBy${field.charAt(0).toUpperCase() + field.slice(1)}`] = true;
-          ...this.queryParams
+      });
-        }, `库存汇总_${new Date().getTime()}.xlsx`)
+
-      },
+      this.download('search/StockSummary/export', params, `库存汇总_${new Date().getTime()}.xlsx`)
-      // 多选框选中数据
+    },
-      handleSelectionChange(selection) {
+    // 多选框选中数据
-        this.ids = selection.map(item => item.onlyIdentity)
+    handleSelectionChange(selection) {
-        this.single = selection.length!==1
+      this.ids = selection.map(item => item.onlyIdentity)
-        this.multiple = !selection.length
+      this.single = selection.length!==1
-      }
+      this.multiple = !selection.length
     }
-  };
+  }
+};
 </script>

ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue

@@ -382,7 +382,11 @@ export default {
   methods: {
     /** 查询仓库列表 */
     getWarehouseList() {
-      warehouseList().then(response => {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      warehouseList(quaryParam).then(response => {
         this.warehouseOptions = response.rows;
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];

ruoyi-ui/src/views/search/ViewInJobFlow/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="作业ID" prop="jobId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.jobId"-->
@@ -200,14 +210,14 @@
 <!--          placeholder="请选择创建时间">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewInJobFlow.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
+<!--      <el-form-item :label="$t('searchViewInJobFlow.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库ID &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.warehouseId"
+<!--          v-model="queryParams.warehouseId"-->
-          :placeholder="$t('searchViewInJobFlow.inputWarehouseId')"
+<!--          :placeholder="$t('searchViewInJobFlow.inputWarehouseId')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item :label="$t('searchViewInJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
         <el-date-picker clearable
           v-model="queryParams.startTime"
@@ -527,7 +537,7 @@
 
 <script>
 import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
-
+import { listWarehouse } from "@/api/bas/warehouse"
 export default {
   name: "ViewInJobFlow",
   dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'],
@@ -551,6 +561,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 仓库选项
+      warehouseOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -598,8 +610,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询入库作业流水列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('searchViewOutJobFlow.jobId')" prop="jobId"> <!-- 作业ID -->
         <el-input
           v-model="queryParams.jobId"
@@ -543,6 +553,7 @@ import {
   addViewOutJobFlow,
   updateViewOutJobFlow
 } from "@/api/search/ViewOutJobFlow"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewOutJobFlow",
@@ -551,6 +562,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -618,8 +631,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询出库做业务流水列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewStockDetail/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="id" prop="onlyIdentity">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.onlyIdentity"-->
@@ -73,14 +83,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
+<!--      <el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.warehouseId"
+<!--          v-model="queryParams.warehouseId"-->
-          :placeholder="$t('searchViewStockDetail.inputWarehouseId')"
+<!--          :placeholder="$t('searchViewStockDetail.inputWarehouseId')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item :label="$t('searchViewStockDetail.stackingId')" prop="stackingId"> <!-- 剁型ID -->
         <el-input
           v-model="queryParams.stackingId"
@@ -333,6 +343,7 @@
 
 <script>
 import { listViewStockDetail, getViewStockDetail, delViewStockDetail, addViewStockDetail, updateViewStockDetail } from "@/api/search/ViewStockDetail"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockDetail",
@@ -340,6 +351,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -393,8 +406,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询库存明细查询列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewStockSecure/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('searchViewStockSecure.stockId')" prop="stockId"> <!-- 库存ID -->
         <el-input
           v-model="queryParams.stockId"
@@ -293,6 +303,7 @@
 
 <script>
 import { listViewStockSecure, getViewStockSecure, delViewStockSecure, addViewStockSecure, updateViewStockSecure } from "@/api/search/ViewStockSecure"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockSecure",
@@ -307,6 +318,8 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -386,8 +399,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询安全库存查询列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewStockWarning/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('searchViewStockWarning.stockId')" prop="stockId"> <!-- 库存ID -->
         <el-input
           v-model="queryParams.stockId"
@@ -273,6 +283,7 @@
 
 <script>
 import { listViewStockWarning, getViewStockWarning, delViewStockWarning, addViewStockWarning, updateViewStockWarning } from "@/api/search/ViewStockWarning"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockWarning",
@@ -281,6 +292,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -366,8 +379,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询预警库存查询列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewStockinHistory/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="入库单guid" prop="stockinGuid">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockinGuid"-->
@@ -63,14 +73,14 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockinHistory.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
+<!--      <el-form-item :label="$t('searchViewStockinHistory.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库ID &ndash;&gt;-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.warehouseId"
+<!--          v-model="queryParams.warehouseId"-->
-          :placeholder="$t('searchViewStockinHistory.inputWarehouseId')"
+<!--          :placeholder="$t('searchViewStockinHistory.inputWarehouseId')"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
 
       <el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill" style="white-space: nowrap"> <!-- ERP单号 -->
         <el-input
@@ -512,6 +522,7 @@
 
 <script>
 import { listViewStockinHistory, getViewStockinHistory, delViewStockinHistory, addViewStockinHistory, updateViewStockinHistory } from "@/api/search/ViewStockinHistory"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockinHistory",
@@ -520,6 +531,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -591,8 +604,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询入库单据历史列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue

@@ -1,6 +1,16 @@
 <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="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+          <el-option
+            v-for="dict in warehouseOptions"
+            :key="dict.warehouseId"
+            :label="dict.warehouseName"
+            :value="dict.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('searchViewStockoutHistory.stockoutId')" prop="stockoutId"> <!-- 出库单号 -->
         <el-input
           v-model="queryParams.stockoutId"
@@ -219,7 +229,8 @@
 
     <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="出库单号" align="center" prop="stockoutId" :label="$t('searchViewStockoutHistory.stockoutId')" /> <!-- 出库单号 -->
+      <el-table-column  align="center" prop="stockoutId" :label="$t('searchViewStockoutHistory.stockoutId')" /> <!-- 出库单号 -->
+      <el-table-column label="warehouseId" align="center" prop="warehouseId"  /> <!-- 出库单号 -->
       <el-table-column :label="$t('searchViewStockoutHistory.outType')" align="center" prop="outType"> <!-- 出库类型 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -379,6 +390,7 @@
 
 <script>
 import { listViewStockoutHistory, getViewStockoutHistory, delViewStockoutHistory, addViewStockoutHistory, updateViewStockoutHistory } from "@/api/search/ViewStockoutHistory"
+import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockoutHistory",
@@ -387,6 +399,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -440,8 +454,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
   },
   methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      listWarehouse(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+      // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
+    },
     /** 查询出库单据历史列表 */
     getList() {
       this.loading = true