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

下载二维码调试

This commit is contained in:
mashuai 2024-11-29 10:12:34 +08:00
parent 04b8cded95
commit 0d9e944ce7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java
View File

@ -110,7 +110,7 @@ public class BackApplyInfo {
private String createBy; private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间") @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/** 1.机具分公司审核通过，2.机具分公司审批不通过，3.调试分公司审批通过，4.调试分公司审批不通过，5.出库进行中，6.出库完成 */ /** 1.机具分公司审核通过，2.机具分公司审批不通过，3.调试分公司审批通过，4.调试分公司审批不通过，5.出库进行中，6.出库完成 */

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

@ -318,6 +318,9 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService {
if (CollectionUtils.isNotEmpty(details)) { if (CollectionUtils.isNotEmpty(details)) {
PurchaseVo detail = details.get(0); PurchaseVo detail = details.get(0);
purchaseDto.setTaskId(detail.getTaskId().toString()); purchaseDto.setTaskId(detail.getTaskId().toString());
if (detail.getBindNum() != null && detail.getBindNum() > 0) {
detail.setCheckNum(detail.getCheckNum() - detail.getBindNum());
}
getString(addedEntries, purchaseDto, genMonth, num, zos, detail.getMaterialModel(), detail.getMaterialName(), detail.getTypeId(), detail.getCheckNum()); getString(addedEntries, purchaseDto, genMonth, num, zos, detail.getMaterialModel(), detail.getMaterialName(), detail.getTypeId(), detail.getCheckNum());
extractedUpStatus(purchaseDto); extractedUpStatus(purchaseDto);
} }