rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '南方陆机/technology-init-lhj1119' into technology-init-lhj1119

This commit is contained in:
曹鹏飞 2025-01-09 11:37:38 +08:00
parent 7723bfea96 b13d3c5625
commit 88f5042521
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
View File

@ -244,6 +244,13 @@ public class MaterialMainVO implements Serializable {
@ExcelColumn("最近采购日期") @ExcelColumn("最近采购日期")
private String lastPurchaseDate; private String lastPurchaseDate;
/**
* 物料价格
*/
@ApiModelProperty(value = "物料价格")
@ExcelColumn("物料价格")
private String materialPrice;
/** /**
* 订单保护价 * 订单保护价
*/ */

1
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
View File

@ -876,6 +876,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
materialMainVO.setOldShortMaterialDesc(materialMainEntity.getShortMaterialDesc()); materialMainVO.setOldShortMaterialDesc(materialMainEntity.getShortMaterialDesc());
materialMainVO.setOldMaterialDesc(materialMainEntity.getMaterialDesc()); materialMainVO.setOldMaterialDesc(materialMainEntity.getMaterialDesc());
materialMainVO.setLastPurchasePrice(ObjectUtil.isNotNull(materialMainEntity.getLastPurchaseDate()) ? materialMainEntity.getLastPurchasePrice() + "" : ""); materialMainVO.setLastPurchasePrice(ObjectUtil.isNotNull(materialMainEntity.getLastPurchaseDate()) ? materialMainEntity.getLastPurchasePrice() + "" : "");
materialMainVO.setMaterialPrice(ObjectUtil.isNotNull(materialMainEntity.getMaterialPrice()) ? materialMainEntity.getMaterialPrice() + "" : "");
List<CompletableFuture> task = new ArrayList<>(); List<CompletableFuture> task = new ArrayList<>();
task.add(CompletableFuture.runAsync(() -> initCurMaterialAttrs(materialMainVO, type))); task.add(CompletableFuture.runAsync(() -> initCurMaterialAttrs(materialMainVO, type)));
task.add(CompletableFuture.runAsync(() -> initPic(materialMainVO))); task.add(CompletableFuture.runAsync(() -> initPic(materialMainVO)));

2
nflg_project_dev/material/src/main/resources/mapper/master/MaterialMainMapper.xml
View File

@ -72,6 +72,7 @@
`material_stock` AS materialStock, `material_stock` AS materialStock,
`last_purchase_price` AS lastPurchasePrice, `last_purchase_price` AS lastPurchasePrice,
`last_purchase_date` AS lastPurchaseDate, `last_purchase_date` AS lastPurchaseDate,
`material_price` AS materialPrice,
`order_protect_price` AS orderProtectPrice, `order_protect_price` AS orderProtectPrice,
`parts_sale_price` AS partsSalePrice, `parts_sale_price` AS partsSalePrice,
`material_state` AS materialState, `material_state` AS materialState,
@ -120,6 +121,7 @@
material_stock, material_stock,
last_purchase_price, last_purchase_price,
last_purchase_date, last_purchase_date,
material_price,
order_protect_price, order_protect_price,
parts_sale_price, parts_sale_price,
material_state, material_state,