From 4293d5a5622758a6a46f3b63e527befcb939caf1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 19:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=BA=93=E7=AE=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api}/domain/RepairTestInputDto.java | 2 +- .../bonus/sgzb/common/log/aspect/LogAspect.java | 15 +++++++++++++++ .../controller/RepairTestInputController.java | 5 ++++- .../material/mapper/RepairTestInputMapper.java | 1 + .../material/service/RepairTestInputService.java | 2 +- .../service/impl/RepairTestInputServiceImpl.java | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) rename {sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material => sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api}/domain/RepairTestInputDto.java (91%) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java similarity index 91% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java index b6f3d62..cc24587 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTestInputDto.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.domain; +package com.bonus.sgzb.base.api.domain; import lombok.Data; 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 498fd2e..310a072 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 @@ -323,6 +323,21 @@ public class LogAspect bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); bmStorageLogList.add(bmStorageLog); } + // 修试后入库-入库操作 + if (joinPoint.getArgs()[0] instanceof RepairTestInputDto) { + RepairTestInputDto rti = (RepairTestInputDto)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setTaskId(String.valueOf(rti.getTaskId())); + bmStorageLog.setTypeId(Integer.parseInt(rti.getTypeId())); +// bmStorageLog.setTypeName(rti.getMaCode()); +// bmStorageLog.setPreStoreNum(Integer.parseInt(rti.getNum())); +// bmStorageLog.setBackNum(rti.getBackNum()); +// bmStorageLog.setPassNum(rti.getPassNum()); +// bmStorageLog.setMaintenanceNum(rti.getMaintenanceNum()); +// bmStorageLog.setScrapNum(rti.getScrapNum()); +// bmStorageLog.setPostStoreNum(rti.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 二级库出入库, 不影响ma_type库存变化，暂时不加库存监控日志 // if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) { // TeamLeaseInfo tli = (TeamLeaseInfo)joinPoint.getArgs()[0]; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index bdd2eb5..cd74888 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -6,8 +6,9 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.PreventRepeatSubmit; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; -import com.bonus.sgzb.material.domain.RepairTestInputDto; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; import com.bonus.sgzb.material.service.RepairTestInputService; import io.swagger.annotations.ApiOperation; @@ -60,6 +61,8 @@ public class RepairTestInputController extends BaseController { } @ApiOperation(value = "修试后入库-入库操作") + @PreventRepeatSubmit + @Log(title = "修试后入库-入库操作", businessType = BusinessType.MATERIAL) @PostMapping("inputByType") public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){ return service.inputByType(dto); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java index bcf0968..297bb64 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.mapper; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java index f1fd24f..d5b76ea 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java @@ -2,7 +2,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; -import com.bonus.sgzb.material.domain.RepairTestInputDto; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index 313f6e6..69bb3b6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service.impl; import com.alibaba.fastjson.JSONObject; +import com.bonus.sgzb.base.api.domain.RepairTestInputDto; import com.bonus.sgzb.common.core.constant.HttpStatus; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.DateTimeHelper; @@ -15,7 +16,6 @@ import com.bonus.sgzb.material.mapper.RepairTestInputMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.mapper.TmTaskAgreementMapper; import com.bonus.sgzb.material.service.RepairTestInputService; -import com.bonus.sgzb.material.vo.GlobalContants; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service;