bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-11-12 09:40:52 +08:00
parent eec736892c 1beca0b8c9
commit 52169a81c4
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java
View File

@ -147,6 +147,15 @@ public class BmConfigServiceImpl implements IBmConfigService
return result; return result;
} }
public String getBmConfigResultAsString(String itemName) {
String value = "";
BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(itemName);
if (Objects.nonNull(bmConfig)) {
value = getValueWithDefault(bmConfig.getItemValue(), "");
}
return value;
}
public List<String> getBmConfigResultAsList(String itemName) { public List<String> getBmConfigResultAsList(String itemName) {
List<String> list = new ArrayList(); List<String> list = new ArrayList();
BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(itemName); BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(itemName);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java
View File

@ -81,5 +81,5 @@ public class PurchaseQueryDto {
* 子任务状态列表, 比如待验收：2,12 待绑定：3,13 待入库：4,14, 参考 PurchaseTaskStatusEnum.java * 子任务状态列表, 比如待验收：2,12 待绑定：3,13 待入库：4,14, 参考 PurchaseTaskStatusEnum.java
*/ */
@ApiModelProperty(value = "子任务状态列表") @ApiModelProperty(value = "子任务状态列表")
private List<Integer> status; private List<Integer> statusList;
} }

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -124,8 +124,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
if (purchaseInfo.getTaxRate() != null && purchaseInfo.getPurchasePrice() != null) { if (purchaseInfo.getTaxRate() != null && purchaseInfo.getPurchasePrice() != null) {
purchaseInfo.setPurchaseTaxPrice(calculateTaxPrice(purchaseMaTotalPrice.get(), purchaseInfo.getTaxRate())); purchaseInfo.setPurchaseTaxPrice(calculateTaxPrice(purchaseMaTotalPrice.get(), purchaseInfo.getTaxRate()));
} }
// 设置外层任务状态：入库待开始、入库进行中、入库已完成
if (maxStatus.isPresent() && maxStatus.getAsInt() == PurchaseTaskStatusEnum.TO_NOTICE.getStatus()) { if (maxStatus.isPresent() && maxStatus.getAsInt() == PurchaseTaskStatusEnum.TO_NOTICE.getStatus()) {
purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus()); // 外层任务未开始 purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus()); // 外层任务待开始
} else if (minStatus.isPresent() && minStatus.getAsInt() == PurchaseTaskStatusEnum.IN_STORE.getStatus()) { } else if (minStatus.isPresent() && minStatus.getAsInt() == PurchaseTaskStatusEnum.IN_STORE.getStatus()) {
purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_FINISHED.getStatus()); // 外层任务已完成 purchaseInfo.setTaskStatus(PurchaseTaskStatusEnum.TASK_FINISHED.getStatus()); // 外层任务已完成
} else { } else {