From 0d9e944ce72f4e03c0bc927dd5714a2b136a2228 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 29 Nov 2024 10:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/back/domain/BackApplyInfo.java | 2 +- .../purchase/service/impl/PurchaseBindServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java index 29391ce5..177f3f2d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java @@ -110,7 +110,7 @@ public class BackApplyInfo { private String createBy; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** 1.机具分公司审核通过，2.机具分公司审批不通过，3.调试分公司审批通过，4.调试分公司审批不通过，5.出库进行中，6.出库完成 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 0ace2e12..e9a2adfe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -318,6 +318,9 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { if (CollectionUtils.isNotEmpty(details)) { PurchaseVo detail = details.get(0); 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()); extractedUpStatus(purchaseDto); }