fix(芯导): 补回各系统丢失的既有文件修改（分支切换导致）

tuqin

2026-10-21 a2599e2fffaf6bb1d781325736f06955fa19511b

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
package com.ruoyi.procurementrecord.controller;
 
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.mapper.StockTakingMapper;
import com.ruoyi.procurementrecord.pojo.StockTaking;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
 
import java.time.LocalDateTime;
import java.util.Arrays;
 
@RestController
@RequestMapping("/stockTaking")
@Api(tags = "仓储物流-库存盘点")
public class StockTakingController {
 
    @Autowired
    private StockTakingMapper stockTakingMapper;
 
    @GetMapping("/listPage")
    public AjaxResult listPage(Page page, StockTaking q) {
        LambdaQueryWrapper<StockTaking> w = new LambdaQueryWrapper<>();
        if (q != null) {
            if (q.getProductCategory() != null && !q.getProductCategory().isEmpty()) {
                w.like(StockTaking::getProductCategory, q.getProductCategory());
            }
            if (q.getSpecificationModel() != null && !q.getSpecificationModel().isEmpty()) {
                w.like(StockTaking::getSpecificationModel, q.getSpecificationModel());
            }
        }
        w.orderByDesc(StockTaking::getId);
        return AjaxResult.success(stockTakingMapper.selectPage(page, w));
    }
 
    @PostMapping
    public AjaxResult add(@RequestBody StockTaking o) {
        if (o.getBookNum() != null && o.getActualNum() != null) {
            o.setDiffNum(o.getActualNum().subtract(o.getBookNum()));
        }
        fillTenant(o);
        o.setCreateTime(LocalDateTime.now());
        o.setUpdateTime(LocalDateTime.now());
        return AjaxResult.success(stockTakingMapper.insert(o) > 0);
    }
 
    @PutMapping
    public AjaxResult edit(@RequestBody StockTaking o) {
        if (o.getBookNum() != null && o.getActualNum() != null) {
            o.setDiffNum(o.getActualNum().subtract(o.getBookNum()));
        }
        o.setUpdateTime(LocalDateTime.now());
        return AjaxResult.success(stockTakingMapper.updateById(o) > 0);
    }
 
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return AjaxResult.success(stockTakingMapper.deleteBatchIds(Arrays.asList(ids)) > 0);
    }
 
    private void fillTenant(StockTaking o) {
        if (o.getTenantId() == null) {
            try {
                o.setTenantId(com.ruoyi.common.utils.SecurityUtils.getLoginUser().getTenantId());
            } catch (Exception ignored) {
            }
        }
    }
}