From 407a9d87ba0bd58e7795ff5387b0cb005d630bed Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:30 +0800
Subject: [PATCH] 生产入库逻辑修改，只有最后一道工序的报工才会入库，只有成品检验和原材料检验入库
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 86feed9..06efa6f 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -8,22 +8,31 @@
@Data
public class StockInventoryExportData {
+ @Excel(name ="浠撳簱缂栫爜")
+ private String warehouseCode;
+ @Excel(name ="浠撳簱")
+ private String warehouseName;
+ @Excel(name = "瀛樿揣缂栫爜")
+ private String productCode;
- @Excel(name = "浜у搧鍚嶇О")
+ @Excel(name = "瀛樿揣")
private String productName;
- @Excel(name = "瑙勬牸")
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String model;
- @Excel(name = "鍗曚綅")
+ @Excel(name = "涓诲崟浣�")
private String unit;
- @Excel(name = "搴撳瓨鏁伴噺")
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
+ @Excel(name = "鏁伴噺(涓诲崟浣�)")
private BigDecimal qualitity;
- @Excel(name = "澶囨敞")
- private String remark;
+ @Excel(name = "鏁伴噺(杈呭崟浣�)")
+ private BigDecimal subQualitity;
//
// @Excel(name = "鏈�鏂版洿鏂版椂闂�")
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3