库存记录修改

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<BmStorageLog> 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> leaseOutDetails = (List<LeaseOutDetails>)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);
+//        }
     }
 
 }

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;
 

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;

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;

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;
 
 /**

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.common.biz.domain.lease.LeaseOutDetails;
-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;
 
 /**
  * 领料出库详细Mapper接口

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接口

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;

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;
 

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.common.biz.domain.lease.LeaseOutDetails;
-import com.bonus.material.lease.domain.LeaseOutDetails;
 import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
 import com.bonus.material.task.domain.TmTask;
 import lombok.Data;

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;

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;

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;

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;

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 ：梁超

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);

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;

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">
 <mapper namespace="com.bonus.material.lease.mapper.LeaseOutDetailsMapper">
-    <resultMap type="com.bonus.material.lease.domain.LeaseOutDetails" id="LeaseOutDetailsResult">
+    <resultMap type="com.bonus.common.biz.domain.lease.LeaseOutDetails" id="LeaseOutDetailsResult">
         <result property="id"    column="id"    />
         <result property="parentId"    column="parent_id"    />
         <result property="typeId"    column="type_id"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lease_out_details lod
     </sql>
 
-    <select id="selectLeaseOutDetailsList" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
+    <select id="selectLeaseOutDetailsList" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
         <include refid="selectLeaseOutDetailsVo"/>
         <where>  
             <if test="parentId != null "> and lod.parent_id = #{parentId}</if>
@@ -47,14 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where lod.id = #{id}
     </select>
 
-    <select id="selectLeaseOutDetailsListByParentId" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
+    <select id="selectLeaseOutDetailsListByParentId" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" resultMap="LeaseOutDetailsResult">
         <include refid="selectLeaseOutDetailsVo"/>
         <where>
             lod.parent_id = #{parentId}
         </where>
     </select>
 
-    <insert id="insertLeaseOutDetails" parameterType="com.bonus.material.lease.domain.LeaseOutDetails" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertLeaseOutDetails" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails" useGeneratedKeys="true" keyProperty="id">
         insert into lease_out_details
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="parentId!= null">
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <update id="updateLeaseOutDetails" parameterType="com.bonus.material.lease.domain.LeaseOutDetails">
+    <update id="updateLeaseOutDetails" parameterType="com.bonus.common.biz.domain.lease.LeaseOutDetails">
         update lease_out_details
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentId != null">parent_id = #{parentId},</if>