From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
index 5097798..bcc868d 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
@@ -1,12 +1,13 @@
package com.ruoyi.purchase.pojo;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
/**
* 鍙戠エ淇℃伅瀵硅薄 invoice_purchase
@@ -26,10 +27,20 @@
private Long id;
/**
+ * 閲囪喘鍙拌处id
+ */
+ private Long purchaseLedgerId;
+
+ /**
* 閲囪喘鍚堝悓鍙�
*/
@Excel(name = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNo;
+
+ /**
+ * 鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�
+ */
+ private Long salesLedgerId;
/**
* 閿�鍞悎鍚屽彿
@@ -52,32 +63,36 @@
/**
* 鍙戠エ閲戦锛堝厓锛�
*/
- @Excel(name = "鍙戠エ閲戦", readConverterExp = "鍏�=")
+ @Excel(name = "鍙戠エ閲戦(鍏�)")
private BigDecimal invoiceAmount;
/**
* 绋庣巼
*/
- @Excel(name = "绋庣巼")
+ @Excel(name = "绋庣巼(%)")
private BigDecimal taxRate;
+
+ /**
+ * 寮�绁ㄤ汉ID
+ */
+ private Long issUerId;
/**
* 寮�绁ㄤ汉
*/
@Excel(name = "寮�绁ㄤ汉")
- private String issuer;
+ private String issUer;
/**
* 寮�绁ㄦ棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
@Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date issueDate;
+ private LocalDate issueDate;
/**
* 鍙戠エ鏂囦欢锛圥DF鏍煎紡锛�
*/
- @Excel(name = "鍙戠エ鏂囦欢", readConverterExp = "P=DF鏍煎紡")
private String invoiceFile;
/**
--
Gitblit v1.9.3