From 9b06f3178f4a4cab2e31dabbec9e55c522603ca1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 6 Aug 2024 12:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/common/log/aspect/LogAspect.java | 2 +- .../sgzb/material/domain/PurchasePartDetails.java | 12 ++++++++++++ .../mapper/material/PurchaseAccessoryMapper.xml | 1 + sgzb-ui/src/views/inventoryLogs/index.vue | 12 +++++++----- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index bc6b0f21..4b4187d7 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -274,7 +274,7 @@ public class LogAspect bmStorageLogList.add(bmStorageLog); } } - // 新购验收任务 + // 新购验收任务,暂时未加"新购配件入库审核"相关日志 PurchaseAccessoryController.checkInput if (joinPoint.getArgs()[0] instanceof MaInputVO) { MaInputVO maInputVO = (MaInputVO) joinPoint.getArgs()[0]; for (MaInputRecord maInputRecord : maInputVO.getInputRecordList()) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index 301d04e5..d485a518 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -31,6 +31,10 @@ public class PurchasePartDetails extends BaseEntity @ApiModelProperty(value = "规格id") private Long partId; + /** 实时库存 */ + @ApiModelProperty(value = "实时库存") + private BigDecimal num; + /** 规格id */ @ApiModelProperty(value = "规格id") private Long typeId; @@ -194,6 +198,14 @@ public class PurchasePartDetails extends BaseEntity this.partId = partId; } + public BigDecimal getNum() { + return num; + } + + public void setNum(BigDecimal num) { + this.num = num; + } + public void setPurchasePrice(String purchasePrice) { this.purchasePrice = purchasePrice; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index 7e11405d..b8b0fc9a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -310,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"