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

协议接口优化

This commit is contained in:
sxu 2024-11-11 16:27:02 +08:00
parent cb814d18b5
commit bc38149902
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
View File

@ -50,6 +50,6 @@ public class MaterialConstants {
public static final Integer TEN_CONSTANT = 10; public static final Integer TEN_CONSTANT = 10;
/** 协议号的开头字母 */ /** 协议号的开头字母 */
public static final String AGREEMENT_PREFIX = "XY"; public static final String AGREEMENT_PREFIX = "H";
} }

2
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/PurchaseTaskStatusEnum.java
View File

@ -12,7 +12,7 @@ public enum PurchaseTaskStatusEnum {
TO_BIND_AFTER_REJECT(13, "待绑定(驳回后)"), TO_BIND_AFTER_REJECT(13, "待绑定(驳回后)"),
TO_STORE_AFTER_REJECT(14, "待入库(驳回后)"), TO_STORE_AFTER_REJECT(14, "待入库(驳回后)"),
IN_STORE(19, "已入库"), IN_STORE(19, "已入库"),
TASK_NOT_START(20, "入库未开始"), TASK_TO_START(20, "入库待开始"),
TASK_IN_PROGRESS(21, "入库进行中"), TASK_IN_PROGRESS(21, "入库进行中"),
TASK_FINISHED(22, "入库已完成"); TASK_FINISHED(22, "入库已完成");

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java
View File

@ -81,7 +81,7 @@ public class BmAgreementInfoServiceImpl implements IBmAgreementInfoService
String result = format.replace("-", ""); String result = format.replace("-", "");
int num = bmAgreementInfoMapper.selectNumByMonth(nowDate); int num = bmAgreementInfoMapper.selectNumByMonth(nowDate);
num = num + 1; num = num + 1;
return MaterialConstants.AGREEMENT_PREFIX + result + String.format("-%05d", num); return MaterialConstants.AGREEMENT_PREFIX + result + String.format("-%04d", num);
} }
// public static void main(String[] args) { // public static void main(String[] args) {

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

@ -125,7 +125,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
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_NOT_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 {