fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 3bf81c083883d4861d53380423ee8a44c899b5f6

 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) {