From 91457e7ce7fe162c1ebe196ea9e8f0ff1d1cfe0b Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 10 Dec 2024 14:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/aspect/StoreLogAspect.java | 76 ++++++++++++++++++- .../biz/domain/lease}/LeaseOutDetails.java | 3 +- .../controller/LeaseOutDetailsController.java | 2 +- .../lease/domain/vo/LeaseOutRequestVo.java | 3 +- .../lease/mapper/LeaseApplyDetailsMapper.java | 2 +- .../lease/mapper/LeaseOutDetailsMapper.java | 7 +- .../service/ILeaseOutDetailsService.java | 2 +- .../impl/LeaseApplyInfoServiceImpl.java | 3 +- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../ma/domain/DirectPassApplyInfoDetails.java | 4 +- .../material/ma/mapper/MachineMapper.java | 2 +- .../bonus/material/ma/mapper/TypeMapper.java | 2 +- .../ma/mapper/WorkSiteDirectManageMapper.java | 2 +- .../service/WorkSiteDirectManageService.java | 2 - .../impl/WorkSiteDirectManageImpl.java | 8 -- .../controller/PurchaseStorageController.java | 6 +- .../mapper/SltAgreementInfoMapper.java | 2 +- .../material/lease/LeaseOutDetailsMapper.xml | 10 +-- 18 files changed, 96 insertions(+), 42 deletions(-) rename {bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain => bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease}/LeaseOutDetails.java (96%) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java index 86c1d7f3..5f166a62 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java @@ -3,6 +3,7 @@ package com.bonus.common.biz.aspect; import com.alibaba.fastjson2.JSON; import com.bonus.common.biz.annotation.StoreLog; import com.bonus.common.biz.domain.BmStorageLog; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.common.biz.service.AsyncStoreLogService; import com.bonus.common.biz.utils.HttpResult; import com.bonus.common.core.utils.ServletUtils; @@ -105,9 +106,82 @@ public class StoreLogAspect { * @throws Exception 异常 */ private void setRequestValue(JoinPoint joinPoint, List bmStorageLogList) throws Exception { - System.err.println("获取请求参数"); + System.out.println("进入获取请求参数"); String requestMethod = ServletUtils.getRequest().getMethod(); Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); + +// if (StringUtils.isEmpty(paramsMap) && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))) { +// // 盘点入库操作 +// if (joinPoint.getArgs()[0] instanceof SavePutInfoDto) { +// SavePutInfoDto savePutInfoDto = (SavePutInfoDto) joinPoint.getArgs()[0]; +// for (MachIneDto machineDto : savePutInfoDto.getMachIneDtoList()) { +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTypeId(Integer.parseInt(machineDto.getTypeId())); +// bmStorageLog.setTypeName(machineDto.getMaCode()); +// bmStorageLog.setPreStoreNum(Objects.isNull(machineDto.getNum()) ? 0 : machineDto.getNum().intValue()); +// bmStorageLog.setInNum(Objects.isNull(machineDto.getPutInStoreNum()) ? 0 : machineDto.getPutInStoreNum().intValue()); +// bmStorageLog.setPostStoreNum(bmStorageLog.getPreStoreNum() + bmStorageLog.getInNum()); +// bmStorageLogList.add(bmStorageLog); +// } +// } +// // 新购验收任务 PurchaseMacodeInfoController.modifyManageStatus +// if (joinPoint.getArgs()[0] instanceof MaInputVO) { +// MaInputVO maInputVO = (MaInputVO) joinPoint.getArgs()[0]; +// for (MaInputRecord maInputRecord : maInputVO.getInputRecordList()) { +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTypeId(Objects.isNull(maInputRecord.getTypeId()) ? 0 : maInputRecord.getTypeId().intValue()); +// bmStorageLog.setTypeName(maInputRecord.getMaCode()); +// bmStorageLog.setPostStoreNum(Objects.isNull(maInputRecord.getNum()) ? 0: maInputRecord.getNum().intValue()); +// bmStorageLog.setInNum(Objects.isNull(maInputRecord.getInputNum()) ? 0: maInputRecord.getInputNum().intValue()); +// bmStorageLog.setPreStoreNum(bmStorageLog.getPostStoreNum() - bmStorageLog.getInNum()); +// bmStorageLog.setTaskId(String.valueOf(maInputRecord.getTaskId())); +// bmStorageLogList.add(bmStorageLog); +// } +// } +// // 领料出库 +// if (joinPoint.getArgs()[0] instanceof List && +// ((List) joinPoint.getArgs()[0]).stream().noneMatch((o -> !(o instanceof LeaseOutDetails)))) { +// List leaseOutDetails = (List)joinPoint.getArgs()[0]; +// for (LeaseOutDetails lod : leaseOutDetails) { +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); +// bmStorageLog.setTypeId(lod.getTypeId()); +// bmStorageLog.setTypeName(lod.getMaCode()); +// bmStorageLog.setPreStoreNum(lod.getPreStoreNum()); +// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); +// bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); +// bmStorageLogList.add(bmStorageLog); +// } +// } +// if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) { +// LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0]; +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); +// bmStorageLog.setTypeId(lod.getTypeId()); +// bmStorageLog.setTypeName(lod.getMaCode()); +// bmStorageLog.setPreStoreNum(lod.getPreStoreNum()); +// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); +// bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); +// bmStorageLogList.add(bmStorageLog); +// } +// // 退料接收-完成退料 +// if (joinPoint.getArgs()[0] instanceof BackApplyInfo) { +// BackApplyInfo bai = (BackApplyInfo)joinPoint.getArgs()[0]; +// BmStorageLog bmStorageLog = new BmStorageLog(); +// bmStorageLog.setTaskId(String.valueOf(bai.getTaskId())); +// bmStorageLog.setTypeId(Integer.parseInt(bai.getTypeId())); +// bmStorageLog.setTypeName(bai.getMaCode()); +// bmStorageLog.setPreStoreNum(bai.getNum()); +// bmStorageLog.setBackNum(bai.getBackNum()); +// bmStorageLog.setPassNum(bai.getPassNum()); +// bmStorageLog.setMaintenanceNum(bai.getMaintenanceNum()); +// bmStorageLog.setScrapNum(bai.getScrapNum()); +// bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); +// bmStorageLogList.add(bmStorageLog); +// } +// } else { +// log.warn("没有获取到请求参数{},或请求方式不是POST、PUT请求:{}", joinPoint.getSignature(), requestMethod); +// } } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java similarity index 96% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetails.java rename to bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java index 61206639..bda9ec2c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java @@ -1,11 +1,10 @@ -package com.bonus.material.lease.domain; +package com.bonus.common.biz.domain.lease; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; -import org.apache.poi.hpsf.Decimal; import java.math.BigDecimal; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java index 76ffaf99..32adbc34 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java @@ -16,7 +16,7 @@ //import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RestController; //import com.bonus.common.log.annotation.SysLog; -//import com.bonus.material.lease.domain.LeaseOutDetails; +//import com.bonus.common.biz.domain.lease.LeaseOutDetails; //import com.bonus.material.lease.service.ILeaseOutDetailsService; //import com.bonus.common.core.web.controller.BaseController; //import com.bonus.common.core.web.domain.AjaxResult; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java index 468fc150..6a93f132 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java @@ -1,9 +1,8 @@ package com.bonus.material.lease.domain.vo; import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.LeaseApplyInfo; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java index 059b6136..bdb8bde0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyDetailsMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.lease.mapper; import java.util.List; import com.bonus.material.lease.domain.LeaseApplyDetails; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import org.apache.ibatis.annotations.Param; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java index 1597f6f9..8be1f951 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseOutDetailsMapper.java @@ -2,12 +2,7 @@ package com.bonus.material.lease.mapper; import java.util.List; -import com.bonus.material.lease.domain.LeaseApplyDetails; -import com.bonus.material.lease.domain.LeaseOutDetails; -import com.bonus.material.ma.domain.Type; -import com.bonus.material.settlement.domain.SltAgreementInfo; -import com.bonus.material.task.domain.TmTask; -import org.apache.ibatis.annotations.Param; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; /** * 领料出库详细Mapper接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java index 978369f4..d0a425e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java @@ -3,7 +3,7 @@ package com.bonus.material.lease.service; import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; /** * 领料出库详细Service接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index dbbb9649..6384c217 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -13,7 +13,7 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.lease.domain.LeaseApplyDetails; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; import com.bonus.material.lease.domain.vo.LeaseOutRequestVo; import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper; @@ -22,7 +22,6 @@ import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import com.bonus.material.lease.mapper.LeaseApplyInfoMapper; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 2d4d7618..2c386d46 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.lease.mapper.LeaseOutDetailsMapper; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.lease.service.ILeaseOutDetailsService; import org.springframework.transaction.annotation.Transactional; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java index 92346538..c8f3fca5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/DirectPassApplyInfoDetails.java @@ -1,10 +1,8 @@ package com.bonus.material.ma.domain; import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.material.back.domain.BackApplyInfo; import com.bonus.material.back.domain.vo.BackApplyRequestVo; -import com.bonus.material.lease.domain.LeaseApplyInfo; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; import com.bonus.material.task.domain.TmTask; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index 114f5da4..cc1b39a3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper; import java.util.List; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MachineVo; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java index 5b411d29..88061c19 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper; import java.util.List; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MaTypeConfigVo; import com.bonus.material.ma.domain.vo.MaTypeVo; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/WorkSiteDirectManageMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/WorkSiteDirectManageMapper.java index 42808c93..aa6f2aed 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/WorkSiteDirectManageMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/WorkSiteDirectManageMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.ma.mapper; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.LeaseApplyInfo; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.settlement.domain.SltAgreementInfo; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java index 2486e628..0134bccf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/WorkSiteDirectManageService.java @@ -1,8 +1,6 @@ package com.bonus.material.ma.service; -import com.bonus.material.back.domain.BackApplyInfo; -import com.bonus.material.lease.domain.LeaseOutDetails; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyInfo; import com.bonus.material.ma.domain.DirectPassApplyInfoDetails; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java index c16a172f..556faa01 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WorkSiteDirectManageImpl.java @@ -1,16 +1,10 @@ package com.bonus.material.ma.service.impl; -import cn.hutool.core.collection.CollUtil; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.back.domain.BackApplyInfo; import com.bonus.material.back.service.IBackApplyInfoService; -import com.bonus.material.lease.domain.LeaseApplyDetails; -import com.bonus.material.lease.domain.LeaseApplyInfo; -import com.bonus.material.lease.domain.LeaseOutDetails; -import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; import com.bonus.material.lease.service.ILeaseApplyInfoService; import com.bonus.material.ma.domain.DirectApplyDetails; import com.bonus.material.ma.domain.DirectApplyInfo; @@ -26,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; /** * @author ：梁超 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java index 45b39f20..570dba80 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java @@ -37,7 +37,7 @@ public class PurchaseStorageController extends BaseController { */ @ApiOperation(value = "入库或批量入库操作") @PreventRepeatSubmit - @RequiresPermissions("purchase:storage:add") +// @RequiresPermissions("purchase:storage:add") @PostMapping("/warehouse") public AjaxResult warehouse(@RequestBody PurchaseDto dto) { return purchaseStorageService.warehouse(dto); @@ -46,7 +46,7 @@ public class PurchaseStorageController extends BaseController { @ApiOperation(value = "查询待绑定编号机具详情") @PreventRepeatSubmit - @RequiresPermissions("purchase:storage:query") +// @RequiresPermissions("purchase:storage:query") @PostMapping("/getMachineById") public AjaxResult getMachineById(@RequestBody PurchaseDto dto) { return purchaseStorageService.getMachineById(dto); @@ -59,7 +59,7 @@ public class PurchaseStorageController extends BaseController { */ @ApiOperation(value = "驳回或批量驳回操作") @PreventRepeatSubmit - @RequiresPermissions("purchase:storage:reject") +// @RequiresPermissions("purchase:storage:reject") @PostMapping("/reject") public AjaxResult reject(@RequestBody PurchaseDto dto) { return purchaseStorageService.reject(dto); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java index f0d84ebc..a982ee9f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/mapper/SltAgreementInfoMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.settlement.mapper; import java.util.List; -import com.bonus.material.lease.domain.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.ma.domain.Type; import com.bonus.material.settlement.domain.SltAgreementApply; import com.bonus.material.settlement.domain.SltAgreementInfo; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml index f4a32113..ca9acacf 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_out_details lod - and lod.parent_id = #{parentId} @@ -47,14 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where lod.id = #{id} - lod.parent_id = #{parentId} - + insert into lease_out_details @@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update lease_out_details parent_id = #{parentId},