备件借用归还

qushaowei

2025-06-05 dff404ac7e0571e7033a42ed189529e70fdc09ee

备件借用归还

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

@@ -37,6 +37,15 @@
    String SPARE_REQUISITION_STATUS_5 = "5";

    /**
     * 备件领用单状态 1:待领取 2:待审批 3:已领取 4:已领取 5:已领取
     */
    String receive_status_1 = "1"; //待领取
    String receive_status_2 = "2"; //待审批
    String receive_status_3 = "3"; //已领取
    String receive_status_4 = "4"; //待归还
    String receive_status_5 = "5"; //已归还

    /**
     * 岗位编码
     */
    //操作工

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java

@@ -1,14 +1,27 @@
package org.jeecg.modules.eam.controller;

import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamSparePartInventory;
import org.jeecg.modules.eam.entity.EamSparePartReceive;
import org.jeecg.modules.eam.entity.EamSparePartReceiveDetail;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import org.jeecg.modules.eam.service.IEamSparePartInventoryService;
import org.jeecg.modules.eam.service.IEamSparePartReceiveDetailService;
import org.jeecg.modules.eam.service.IEamSparePartReceiveService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -37,6 +50,12 @@
    @Resource
    private IEamSparePartReceiveService eamSparePartReceiveService;

    @Resource
    private IEamSparePartReceiveDetailService sparePartReceiveDetailService;

    @Resource
    private IEamSparePartInventoryService sparePartInventoryService;

    /**
     * 分页列表查询
     *
@@ -52,9 +71,28 @@
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamSparePartReceive> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartReceive, req.getParameterMap());
//        QueryWrapper<EamSparePartReceive> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartReceive, req.getParameterMap());
        QueryWrapper<EamSparePartReceive> queryWrapper = new QueryWrapper<>();
        String receiveCode = eamSparePartReceive.getReceiveCode();
        if(StringUtils.isNotBlank(receiveCode)){
            queryWrapper.like("receive_code",receiveCode);
        }
        String receiveStatus = eamSparePartReceive.getReceiveStatus();
        if(StringUtils.isNotBlank(receiveStatus)){
            queryWrapper.eq("receive_status",receiveStatus);
        }
        String receiveUser = eamSparePartReceive.getReceiveUser();
        if(StringUtils.isNotBlank(receiveUser)){
            queryWrapper.like("receive_user",receiveUser);
        }
        queryWrapper.orderByDesc("create_time");
        Page<EamSparePartReceive> page = new Page<EamSparePartReceive>(pageNo, pageSize);
        IPage<EamSparePartReceive> pageList = eamSparePartReceiveService.page(page, queryWrapper);
        for (EamSparePartReceive record : pageList.getRecords()) {
            List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery()
                    .eq(EamSparePartReceiveDetail::getSparePartReceiveId, record.getId()).list();
            record.setSparePartReceiveDetails(details);
        }
        return Result.OK(pageList);
    }

@@ -66,8 +104,18 @@
     */
    @ApiOperation(value = "备品备件领用单-添加", notes = "备品备件领用单-添加")
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = Exception.class)
    public Result<?> add(@RequestBody EamSparePartReceive eamSparePartReceive) {
        eamSparePartReceive.setReceiveStatus(BusinessCodeConst.receive_status_1);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String realName = user.getRealname();
        eamSparePartReceive.setReceiveUser(realName);
        eamSparePartReceiveService.save(eamSparePartReceive);
        List<EamSparePartReceiveDetail> sparePartReceiveDetails = eamSparePartReceive.getSparePartReceiveDetails();
        for (EamSparePartReceiveDetail sparePartReceiveDetail : sparePartReceiveDetails) {
            sparePartReceiveDetail.setSparePartReceiveId(eamSparePartReceive.getId());
            sparePartReceiveDetailService.saveOrUpdate(sparePartReceiveDetail);
        }
        return Result.OK("添加成功！");
    }

@@ -79,8 +127,18 @@
     */
    @ApiOperation(value = "备品备件领用单-编辑", notes = "备品备件领用单-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = Exception.class)
    public Result<?> edit(@RequestBody EamSparePartReceive eamSparePartReceive) {
        eamSparePartReceiveService.updateById(eamSparePartReceive);
        List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery().eq(EamSparePartReceiveDetail::getSparePartReceiveId, eamSparePartReceive.getId()).list();
        for (EamSparePartReceiveDetail detail : details) {
            sparePartReceiveDetailService.removeById(detail);
        }
        List<EamSparePartReceiveDetail> sparePartReceiveDetails = eamSparePartReceive.getSparePartReceiveDetails();
        for (EamSparePartReceiveDetail sparePartReceiveDetail : sparePartReceiveDetails) {
            sparePartReceiveDetail.setSparePartReceiveId(eamSparePartReceive.getId());
            sparePartReceiveDetailService.saveOrUpdate(sparePartReceiveDetail);
        }
        return Result.OK("编辑成功!");
    }

@@ -92,7 +150,13 @@
     */
    @ApiOperation(value = "备品备件领用单-通过id删除", notes = "备品备件领用单-通过id删除")
    @DeleteMapping(value = "/delete")
    @Transactional(rollbackFor = Exception.class)
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery()
                .eq(EamSparePartReceiveDetail::getSparePartReceiveId,id).list();
        for (EamSparePartReceiveDetail detail : details) {
            sparePartReceiveDetailService.removeById(detail);
        }
        eamSparePartReceiveService.removeById(id);
        return Result.OK("删除成功!");
    }
@@ -105,7 +169,16 @@
     */
    @ApiOperation(value = "备品备件领用单-批量删除", notes = "备品备件领用单-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    @Transactional(rollbackFor = Exception.class)
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> strings = Arrays.asList(ids.split(","));
        for (String s : strings) {
            List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery()
                    .eq(EamSparePartReceiveDetail::getSparePartReceiveId,s).list();
            for (EamSparePartReceiveDetail detail : details) {
                sparePartReceiveDetailService.removeById(detail);
            }
        }
        this.eamSparePartReceiveService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
    }
@@ -124,6 +197,102 @@
    }

    /**
     * 提交
     *
     * @return
     */
    @AutoLog(value = "备件领用-提交")
    @ApiOperation(value = "备件领用-提交", notes = "备件领用-提交")
    @PostMapping(value = "/submit")
    public Result<?> submitSparePartReceive(@RequestBody EamSparePartReceive eamSparePartReceive) {
        eamSparePartReceive.setReceiveStatus(BusinessCodeConst.receive_status_2);
        boolean b = eamSparePartReceiveService.updateById(eamSparePartReceive);
        if (!b) {
            return Result.error("提交失败！");
        }
        return Result.OK("提交成功!");
    }

    /**
     * 确认
     *
     * @return
     */
    @AutoLog(value = "备件领用-确认")
    @ApiOperation(value = "备件领用-确认", notes = "备件领用-确认")
    @PostMapping(value = "/confirm")
    @Transactional(rollbackFor = Exception.class)
    public Result<?> confirmSparePartReceive(@RequestBody EamSparePartReceive eamSparePartReceive) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法确认备件领用！");
        }
        List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery().eq(EamSparePartReceiveDetail::getSparePartReceiveId, eamSparePartReceive.getId()).list();
        for (EamSparePartReceiveDetail detail : details) {
            EamSparePartInventory eamSparePartInventory = new EamSparePartInventory();
            eamSparePartInventory.setSparePartId(detail.getPartId());
            eamSparePartInventory.setInventory(detail.getReceiveNum().negate());
            eamSparePartInventory.setSparePartIntoType("2");//库存来源类型 1.入库 2.领料出库 3.归还入库
            sparePartInventoryService.save(eamSparePartInventory);
        }
        eamSparePartReceive.setApprovalUser(sysUser.getRealname());
        eamSparePartReceive.setApprovalTime(new Date());
        eamSparePartReceive.setReceiveStatus(BusinessCodeConst.receive_status_3);
        boolean b = eamSparePartReceiveService.updateById(eamSparePartReceive);
        if (!b) {
            return Result.error("确认失败！");
        }
        return Result.OK("确认成功!");
    }

    /**
     * 归还
     *
     * @return
     */
    @AutoLog(value = "备件领用-归还")
    @ApiOperation(value = "备件领用-归还", notes = "备件领用-归还")
    @PostMapping(value = "/return")
    public Result<?> returnSparePartReceive(@RequestBody EamSparePartReceive eamSparePartReceive) {
        eamSparePartReceive.setReceiveStatus(BusinessCodeConst.receive_status_4);
        boolean b = eamSparePartReceiveService.updateById(eamSparePartReceive);
        if (!b) {
            return Result.error("归还失败！");
        }
        return Result.OK("归还成功!");
    }

    /**
     * 归还确认
     *
     * @return
     */
    @AutoLog(value = "备件领用-归还确认")
    @ApiOperation(value = "备件领用-归还确认", notes = "备件领用-归还确认")
    @PostMapping(value = "/returnConfirm")
    @Transactional(rollbackFor = Exception.class)
    public Result<?> returnConfirmSparePartReceive(@RequestBody EamSparePartReceive eamSparePartReceive) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法确认备件归还！");
        }
        List<EamSparePartReceiveDetail> details = sparePartReceiveDetailService.lambdaQuery().eq(EamSparePartReceiveDetail::getSparePartReceiveId, eamSparePartReceive.getId()).list();
        for (EamSparePartReceiveDetail detail : details) {
            EamSparePartInventory eamSparePartInventory = new EamSparePartInventory();
            eamSparePartInventory.setSparePartId(detail.getPartId());
            eamSparePartInventory.setInventory(detail.getReceiveNum());
            eamSparePartInventory.setSparePartIntoType("3");//库存来源类型 1.入库 2.领料出库 3.归还入库
            sparePartInventoryService.save(eamSparePartInventory);
        }
        eamSparePartReceive.setReceiveStatus(BusinessCodeConst.receive_status_5);
        boolean b = eamSparePartReceiveService.updateById(eamSparePartReceive);
        if (!b) {
            return Result.error("归还确认失败！");
        }
        return Result.OK("归还确认成功!");
    }

    /**
     * 导出excel
     *
     * @param request

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java

@@ -9,6 +9,8 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.eam.entity.EamSparePartReceiveDetail;
import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
import org.jeecg.modules.eam.entity.EamSpareParts;
import org.jeecg.modules.eam.service.IEamSparePartReceiveDetailService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,6 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;

import org.jeecg.modules.eam.service.IEamSparePartsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -37,6 +40,9 @@
    @Resource
    private IEamSparePartReceiveDetailService eamSparePartReceiveDetailService;

    @Resource
    private IEamSparePartsService eamSparePartsService;

    /**
     * 分页列表查询
     *
@@ -55,6 +61,14 @@
        QueryWrapper<EamSparePartReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartReceiveDetail, req.getParameterMap());
        Page<EamSparePartReceiveDetail> page = new Page<EamSparePartReceiveDetail>(pageNo, pageSize);
        IPage<EamSparePartReceiveDetail> pageList = eamSparePartReceiveDetailService.page(page, queryWrapper);
        for (EamSparePartReceiveDetail record : pageList.getRecords()) {
            String partId = record.getPartId();
            EamSpareParts part = eamSparePartsService.getById(partId);
            record.setPartCode(part.getPartCode());
            record.setPartName(part.getPartName());
            record.setPartModel(part.getPartModel());
            record.setPartSpecification(part.getPartSpecification());
        }
        return Result.OK(pageList);
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java

@@ -1,16 +1,21 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @Description: 备品备件领用单
@@ -31,8 +36,8 @@
     * 删除标记
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**
     * 领用单编码
     */
@@ -56,12 +61,14 @@
     */
    @Excel(name = "领用状态", width = 15)
    @ApiModelProperty(value = "领用状态")
    @Dict(dicCode = "receive_status")
    private String receiveStatus;
    /**
     * 是否需要归还;是：存在归还动作，否：直接完成
     */
    @Excel(name = "是否需要归还;是：存在归还动作，否：直接完成", width = 15)
    @ApiModelProperty(value = "是否需要归还;是：存在归还动作，否：直接完成")
    @Dict(dicCode = "give_back_flag")
    private String giveBackFlag;
    /**
     * 审核人
@@ -80,4 +87,17 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * 备件领用明细单
     */
    @TableField(exist = false)
    private List<Map<String, Object>> sparePartReceiveDetailList;

    @TableField(exist = false)
    private List<EamSparePartReceiveDetail> sparePartReceiveDetails;

    @TableField(exist = false)
    private List<EamSparePartReceiveDetail> removeDetailList;

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceiveDetail.java

@@ -1,11 +1,13 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;

@@ -31,8 +33,8 @@
     * 删除标记
     */
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    private Integer delFlag;
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**
     * 备件ID
     */
@@ -51,4 +53,23 @@
    @Excel(name = "领用类型;领用/归还", width = 15)
    @ApiModelProperty(value = "领用类型;领用/归还")
    private String receiveType;

    /**
     * 领用单id
     */
    @Excel(name = "领用单id", width = 15)
    @ApiModelProperty(value = "领用单id")
    private String sparePartReceiveId;

    @TableField(exist = false)
    private String partCode;

    @TableField(exist = false)
    private String partName;

    @TableField(exist = false)
    private String partModel;

    @TableField(exist = false)
    private String partSpecification;
}