From d34c494aca01c93200935118a4155ab96d46f8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
<9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Mon, 12 Jan 2026 17:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/ViewStockoutHistory.java | 164 +--
.../src/views/search/StockSummary/index.vue | 4 +-
.../src/views/search/ViewInJobFlow/index.vue | 56 +-
.../src/views/search/ViewOutJobFlow/index.vue | 1180 +++++++++--------
.../views/search/ViewStockDetail/index.vue | 10 +-
.../views/search/ViewStockinHistory/index.vue | 72 +-
.../search/ViewStockoutHistory/index.vue | 763 ++++++-----
7 files changed, 1153 insertions(+), 1096 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
index 19f5c3b..89bd976 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
@@ -17,121 +17,121 @@ public class ViewStockoutHistory extends BaseEntity
private static final long serialVersionUID = 1L;
/** 546 guid */
- @Excel(name = "546 guid")
+// @Excel(name = "546 guid")
private String stockoutGuid;
/** 546 单据编码 */
- @Excel(name = "546 单据编码")
+ @Excel(name = "出库单ID")
private String stockoutId;
- /** 546 出库类型 */
- @Excel(name = "546 出库类型")
- private String outType;
-
- /** 546 单据时间 */
- @Excel(name = "546 单据时间")
- private String createDate;
-
- /** 项目号546 */
- @Excel(name = "项目号546")
- private String departmentNo;
-
- /** 客户编码546 */
- @Excel(name = "客户编码546")
- private String customerNo;
-
- /** 制单人546 */
- @Excel(name = "制单人546")
- private String createManId;
-
- /** 546 单据状态 */
- @Excel(name = "546 单据状态")
- private String status;
-
- /** 单据来源0自建单1接口 */
- @Excel(name = "单据来源0自建单1接口")
- private String stockoutSource;
-
- /** 仓库ID546 */
- @Excel(name = "仓库ID546")
- private String warehouseId;
-
- /** 客户名称546 */
- @Excel(name = "客户名称546")
- private String classNowId;
-
- /** 出口 */
- @Excel(name = "出口")
- private String exitId;
-
- /** 合同号546 */
- @Excel(name = "合同号546")
- private String spare1;
-
- /** 销售订单号546 */
- @Excel(name = "销售订单号546")
- private String spare2;
-
- /** 审核时间546 */
- @Excel(name = "审核时间546")
- private String spare3;
-
- /** 审核人546 */
- @Excel(name = "审核人546")
- private String spare4;
-
- /** 备注546 */
- @Excel(name = "备注546")
- private String spare5;
-
/** 546 子单 */
- @Excel(name = "546 子单")
+ @Excel(name = "子单ID")
private String stockoutDetailId;
- /** 546 批次 */
- @Excel(name = "546 批次")
- private String lotNo;
+ /** 项目号546 */
+ @Excel(name = "项目号")
+ private String departmentNo;
/** 546 资材编码 */
- @Excel(name = "546 资材编码")
+ @Excel(name = "物料编码")
private String productId;
- /** 546 数量 */
- @Excel(name = "546 数量")
- private BigDecimal quantity;
+ /** 546品名 */
+ @Excel(name = "物料名称")
+ private String productName;
- /** 货位实际数量 */
- @Excel(name = "货位实际数量")
- private BigDecimal assignNum;
+ /** 546 批次 */
+ @Excel(name = "批次")
+ private String lotNo;
+
+ /** 546 数量 */
+ @Excel(name = "数量")
+ private BigDecimal quantity;
/** 货位分配数量 */
@Excel(name = "货位分配数量")
private BigDecimal allotQuantity;
+ /** 货位实际数量 */
+ @Excel(name = "货位实际数量")
+ private BigDecimal assignNum;
+
+ /** 546 出库类型 */
+ @Excel(name = "出库类型",dictType = "out_bill_type")
+ private String outType;
+
+ /** 审核人546 */
+ @Excel(name = "审核人")
+ private String spare4;
+
+ /** 审核时间546 */
+ @Excel(name = "审核时间")
+ private String spare3;
+
+ /** 销售订单号546 */
+ @Excel(name = "销售订单号")
+ private String spare2;
+
+ /** 合同号546 */
+ @Excel(name = "合同号")
+ private String spare1;
+
+ /** 客户编码546 */
+ @Excel(name = "客户编码")
+ private String customerNo;
+
+ /** 客户名称546 */
+ @Excel(name = "客户名称")
+ private String classNowId;
+
/** 计量单位546 */
- @Excel(name = "计量单位546")
+ @Excel(name = "计量单位")
private String unit;
/** 规格型号546 */
- @Excel(name = "规格型号546")
+ @Excel(name = "规格型号")
private String spec;
- /** 546品名 */
- @Excel(name = "546品名")
- private String productName;
-
/** 层级关系546 */
- @Excel(name = "层级关系546")
+ @Excel(name = "层级关系")
private String cjgx;
/** 上层物料546 */
- @Excel(name = "上层物料546")
+ @Excel(name = "上层物料")
private String scwl;
/** 顶层物料546 */
- @Excel(name = "顶层物料546")
+ @Excel(name = "顶层物料")
private String dcwl;
+ /** 546 单据时间 */
+ @Excel(name = "单据时间")
+ private String createDate;
+
+ /** 制单人546 */
+ @Excel(name = "制单人")
+ private String createManId;
+
+ /** 仓库ID546 */
+ @Excel(name = "仓库ID")
+ private String warehouseId;
+
+ /** 546 单据状态 */
+ @Excel(name = "单据状态",dictType = "out_bill_status")
+ private String status;
+
+ /** 单据来源0自建单1接口 */
+ @Excel(name = "单据来源", readConverterExp = "0=自建单,1=接口")
+ private String stockoutSource;
+
+ /** 出口 */
+ @Excel(name = "出口")
+ private String exitId;
+
+ /** 备注546 */
+ @Excel(name = "备注")
+ private String spare5;
+
/** 货位，托盘加数量按逗号分开546 */
@Excel(name = "货位，托盘加数量按逗号分开546")
private String spare9;
diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue
index 9d844af..5dde109 100644
--- a/ruoyi-ui/src/views/search/StockSummary/index.vue
+++ b/ruoyi-ui/src/views/search/StockSummary/index.vue
@@ -112,7 +112,7 @@
max-height="650"
>
-
+
@@ -127,7 +127,7 @@
/>
-
+
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index a1c3764..c940951 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -1,10 +1,10 @@
-
+
@@ -421,20 +421,20 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -442,22 +442,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index 78bf146..0f385c7 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -1,26 +1,32 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -116,38 +375,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
-
+ >导出
-
+
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+