From b13d3c56255ecd653264d4912a4810e798c0d168 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 9 Jan 2025 10:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E3=80=91SAP=E4=BC=B0=E4=BB=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/material/pojo/vo/MaterialMainVO.java | 7 +++++++ .../nflg/product/material/service/MaterialMainService.java | 1 + .../main/resources/mapper/master/MaterialMainMapper.xml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java index b7d64eda..edd0e95a 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java @@ -244,6 +244,13 @@ public class MaterialMainVO implements Serializable { @ExcelColumn("最近采购日期") private String lastPurchaseDate; + /** + * 物料价格 + */ + @ApiModelProperty(value = "物料价格") + @ExcelColumn("物料价格") + private String materialPrice; + /** * 订单保护价 */ diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index ac42097d..38b2d473 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -876,6 +876,7 @@ public class MaterialMainService extends ServiceImpl task = new ArrayList<>(); task.add(CompletableFuture.runAsync(() -> initCurMaterialAttrs(materialMainVO, type))); task.add(CompletableFuture.runAsync(() -> initPic(materialMainVO))); diff --git a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml index ad619a32..dcadabc9 100644 --- a/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -72,6 +72,7 @@ `material_stock` AS materialStock, `last_purchase_price` AS lastPurchasePrice, `last_purchase_date` AS lastPurchaseDate, + `material_price` AS materialPrice, `order_protect_price` AS orderProtectPrice, `parts_sale_price` AS partsSalePrice, `material_state` AS materialState, @@ -120,6 +121,7 @@ material_stock, last_purchase_price, last_purchase_date, + material_price, order_protect_price, parts_sale_price, material_state,