Merge remote-tracking branch 'origin/dev' into dev

2026-03-10 14:29:33 +08:00
parent 80353a9699 27fdb5cd3b
commit 106fbe9a90
2 changed files with 66 additions and 2 deletions
@@ -386,6 +386,15 @@ public class ExcelParseService {
                    outMaterialDetailDO.setSkucode(materialBaseInfoPO.getBarCode());
                }
            }
+            // 单位：优先使用Excel中的"单位"字段，如果为空则使用"申报单位"，如果还为空则从物料主数据获取（与入库单导入处理一致）
+            String unit = StringUtils.isNotBlank(outMaterialDetailDO.getUnit()) ? outMaterialDetailDO.getUnit() : null;
+            if (StringUtils.isBlank(unit) && StringUtils.isNotBlank(outMaterialDetailDO.getDeclareUnit())) {
+                unit = outMaterialDetailDO.getDeclareUnit();
+            }
+            if (StringUtils.isBlank(unit) && materialBaseInfoPO != null && StringUtils.isNotBlank(materialBaseInfoPO.getUnitName())) {
+                unit = materialBaseInfoPO.getUnitName();
+            }
+            outMaterialDetailDO.setUnit(unit);
        }
    }