cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.require.dto.AcceptanceDto;
import com.ruoyi.require.pojo.FeStandardSubstance;
import com.ruoyi.require.pojo.FeStandardSubstanceAcceptanceInspection;
import com.ruoyi.require.service.FeStandardSubstanceAcceptanceInspectionService;
import com.ruoyi.require.service.FeStandardSubstanceAcceptanceService;
import com.ruoyi.require.service.FeStandardSubstanceService;
import com.ruoyi.require.vo.AcceptanceVo;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -34,6 +36,8 @@
    private FeStandardSubstanceAcceptanceInspectionService inspectionService;
    @Resource
    private FeStandardSubstanceAcceptanceService feStandardSubstanceAcceptanceService;
    @Resource
    private FeStandardSubstanceService feStandardSubstanceService;
    @Operation(summary = "新增")
    @PostMapping("/addAcceptance")
@@ -58,7 +62,20 @@
    @Operation(summary = "编辑")
    @PostMapping("/updateAcceptance")
    @Transactional
    public Result updateAcceptance(@RequestBody AcceptanceDto acceptanceDto) {
        FeStandardSubstance substance = acceptanceDto.getSubstance();
        if (substance != null) {
            if (substance.getId() == null) {
                substance.setState(0);
                feStandardSubstanceService.save(substance);
            } else {
                // 领用状态由领用/归还操作维护,编辑验收单时不回写
                substance.setState(null);
                feStandardSubstanceService.updateById(substance);
            }
            acceptanceDto.getAcceptance().setSubstanceId(substance.getId());
        }
        feStandardSubstanceAcceptanceService.updateById(acceptanceDto.getAcceptance());
        for (FeStandardSubstanceAcceptanceInspection v : acceptanceDto.getList()) {
            if (v.getId()== null) {