修复盘点明细已盘未盘计数bug

朱桂飞

2025-02-14 9518ee94bf232c771edd97e2c6a00ba5d7f18242

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java

@@ -6,6 +6,10 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.eims.domain.bo.EimsEquBo;
import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.service.IEimsEquService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -35,11 +39,12 @@
public class EimsInventoryDetailController extends BaseController {

    private final IEimsInventoryDetailService eimsInventoryDetailService;
    private final IEimsEquService equService;

    /**
     * 查询盘点明细列表
     */
    @SaCheckPermission("eims:inventoryDetail:list")
    @SaCheckPermission("eims:inventory:list")
    @GetMapping("/list")
    public TableDataInfo<EimsInventoryDetailVo> list(EimsInventoryDetailBo bo, PageQuery pageQuery) {
        //return eimsInventoryDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +54,7 @@
    /**
     * 导出盘点明细列表
     */
    @SaCheckPermission("eims:inventoryDetail:export")
    @SaCheckPermission("eims:inventory:export")
    @Log(title = "盘点明细", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(EimsInventoryDetailBo bo, HttpServletResponse response) {
@@ -62,7 +67,7 @@
     *
     * @param id 主键
     */
    @SaCheckPermission("eims:inventoryDetail:query")
    @SaCheckPermission("eims:inventory:query")
    @GetMapping("/{id}")
    public R<EimsInventoryDetailVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
@@ -72,7 +77,7 @@
    /**
     * 新增盘点明细
     */
    @SaCheckPermission("eims:inventoryDetail:add")
    @SaCheckPermission("eims:inventory:add")
    @Log(title = "盘点明细", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -83,11 +88,19 @@
    /**
     * 修改盘点明细
     */
    @SaCheckPermission("eims:inventoryDetail:edit")
    @SaCheckPermission("eims:inventory:edit")
    @Log(title = "盘点明细", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsInventoryDetailBo bo) {
        //TODO 验证-首次盘点，需要修改设备导入状态 新导入->已确认
        if(bo.getStatus().equals("1")){ //已盘
            EimsEquVo eimsEquVo = equService.queryById(bo.getEquId());
            EimsEquBo eimsEquBo =  new EimsEquBo();
            eimsEquVo.setImportStatus("1"); // 设置为 已确认
            BeanUtils.copyProperties(eimsEquVo,eimsEquBo);
            equService.updateByBo(eimsEquBo);
        }
        return toAjax(eimsInventoryDetailService.updateByBo(bo));
    }

@@ -96,7 +109,7 @@
     *
     * @param ids 主键串
     */
    @SaCheckPermission("eims:inventoryDetail:remove")
    @SaCheckPermission("eims:inventory:remove")
    @Log(title = "盘点明细", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")