purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善商品根据条码获取单价的接口

Browse Source
This commit is contained in:
jishenghua
2025-08-05 22:52:17 +08:00
parent 1c4f49734f
commit db479d6874
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -613,7 +613,7 @@ public class MaterialController extends BaseController {
|| "PDLR".equals(prefixNo) || "PDFP".equals(prefixNo)) {
//采购价-给录入界面按权限屏蔽
mvo.setBillPrice(roleService.parseBillPriceByLimit(mvo.getPurchaseDecimal(), "buy", priceLimit, request));
} if ("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) {
} else if ("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) {
//销售价
if(organId == null) {
mvo.setBillPrice(mvo.getWholesaleDecimal());
@@ -631,6 +631,14 @@ public class MaterialController extends BaseController {
if("QTCK".equals(prefixNo)) {
mvo.setBillPrice(roleService.parseBillPriceByLimit(mvo.getWholesaleDecimal(), "sale", priceLimit, request));
}
} else if ("other".equals(prefixNo)) {
//其它需要填充商品采购价或者成本价的场景
if(systemConfigService.getMoveAvgPriceFlag()) {
BigDecimal currentUnitPrice = materialService.getCurrentUnitPriceByMaterialId(mvo.getId());
mvo.setBillPrice(currentUnitPrice);
} else {
mvo.setBillPrice(mvo.getPurchaseDecimal());
}
}
//仓库id
if (depotId == null) {

4
jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java
View File

@@ -1470,6 +1470,10 @@ public class MaterialService {
return materialMapperEx.getMaterialExtendBySerialNumber(serialNumber);
}
public BigDecimal getCurrentUnitPriceByMaterialId(Long materialId) {
return materialCurrentStockMapperEx.getCurrentUnitPriceByMId(materialId);
}
/**
* 构造多属性数组字符串
* @param obj