质检单问题修复

skyouc

5 天以前 162072ac75b009a24cb84569ea7000a782c0fa34

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java

@@ -13,10 +13,16 @@
import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,12 +30,15 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Slf4j
@Api(tags = "质检信息")
@RestController
public class QlyInspectController extends BaseController {

    @Autowired
    private QlyInspectService qlyInspectService;
    @Autowired
    private QlyIsptItemService qlyIsptItemService;

    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
    @PostMapping("/qlyInspect/page")
@@ -50,7 +59,7 @@
    }

    @PostMapping("/qlyInspect/reports")
    @ApiOperation("获取已上报单据明细")
    @ApiOperation("获取可质检单据明细")
    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
    public R listByAsnCode(@RequestBody Map<String, Object> map) {
        if (Objects.isNull(map)) {
@@ -62,7 +71,7 @@
    @PostMapping("/qlyInspect/asn/list")
    @ApiOperation("获取待质检单")
    @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
    public R getUnInspect(@RequestBody Map<String, Object> map) {
    public R getUnInspect(@RequestBody Map<String, String> map) {
        if (Objects.isNull(map)) {
            return R.error("参数不能为空！！");
        }
@@ -104,10 +113,20 @@
    public R save(@RequestBody QlyInspect qlyInspect) {
        qlyInspect.setCreateBy(getLoginUserId());
        qlyInspect.setUpdateBy(getLoginUserId());
        if (!qlyInspectService.save(qlyInspect)) {
        if (!qlyInspectService.qlySave(qlyInspect)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(qlyInspect);
    }

    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
    @ApiOperation("审核确认")
    @PostMapping("/qlyInspect/verify/complate/{id}")
    public R verifyComplate(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            throw new CoolException("参数不能为空！！");
        }
        return qlyInspectService.verifyComplate(id);
    }

    @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
@@ -129,12 +148,19 @@
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("能数不能为空！！");
        }
        List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>().in(QlyInspect::getId, ids));
        List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>()
                .in(QlyInspect::getId, ids)
                .gt(QlyInspect::getIsptQty, 0)
        );
        if (!qlyInspects.isEmpty()) {
            return R.error("有明细列表存在！！");
            return R.error("有明细单据已在质检中！！");
        }
        if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
            return R.error("主单删除失败！！");
        }

        if (!qlyIsptItemService.remove(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getIspectId, ids))) {
            return R.error("明细删除失败！！");
        }
        return R.ok("Delete Success").add(ids);
    }