From 3bf81c083883d4861d53380423ee8a44c899b5f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:04:46 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新
---
src/main/java/com/ruoyi/stock/word/WeighbridgeDocGenerator.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/word/WeighbridgeDocGenerator.java b/src/main/java/com/ruoyi/stock/word/WeighbridgeDocGenerator.java
index f13a3d5..dacc203 100644
--- a/src/main/java/com/ruoyi/stock/word/WeighbridgeDocGenerator.java
+++ b/src/main/java/com/ruoyi/stock/word/WeighbridgeDocGenerator.java
@@ -204,7 +204,7 @@
}
XWPFRun unitRun = unitPara.createRun();
- unitRun.setText("璁￠噺鍗曚綅锛氾紙鍚級");
+ unitRun.setText("璁￠噺鍗曚綅锛�" + dto.getUnit());
unitRun.setFontSize(12);
unitRun.setFontFamily("瀹嬩綋");
@@ -303,9 +303,9 @@
String[] data = {
dto.getLicensePlateNo() != null ? dto.getLicensePlateNo() : "",
getProductModelName(dto.getProductId()),
- grossWeight + "t",
- tareWeight + "t",
- netWeight + "t",
+ grossWeight + dto.getUnit(),
+ tareWeight + dto.getUnit(),
+ netWeight + dto.getUnit(),
dto.getRemark() != null ? dto.getRemark() : ""
};
@@ -362,7 +362,7 @@
);
XWPFTableCell startCell = totalRow.getCell(1);
- startCell.setText(netWeightChinese + "鍚�");
+ startCell.setText(netWeightChinese + dto.getUnit());
startCell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
while (startCell.getParagraphs().size() > 1) {
--
Gitblit v1.9.3