liding
6 天以前 3728fa293e1faf4bf4f9bf41105b84ddb43dc82e
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -1,5 +1,6 @@
package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.InventoryDetailDTO;
@@ -14,6 +15,9 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsOrderDeletionService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.inspect.service.InsOrderTemplateService;
import com.ruoyi.inspect.service.InsProductService;
import com.ruoyi.inspect.service.InsSampleService;
@@ -39,6 +43,8 @@
public class InsOrderController {
    private InsOrderService insOrderService;
    private InsOrderDeletionService insOrderDeletionService;
    private InsSampleService insSampleService;
@@ -227,16 +233,12 @@
        return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
    }
    @Operation(summary = "删除退回订单")
    @Operation(summary = "删除委托单及全部关联记录")
    @PreAuthorize("@ss.hasPermi('delete:insOrder')")
    @Log(title = "委托单及关联记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/delInsOrder")
    public Result<?> delInsOrder(Integer insOrderId) {
        // 查询订单
        InsOrder order = insOrderService.getById(insOrderId);
        if (!(order.getState().equals(2) || order.getState().equals(3))) {
            throw new ErrorException("只有退回订单才能删除");
        }
        return Result.success(insOrderService.removeById(insOrderId));
    public Result<?> delInsOrder(@RequestParam Integer insOrderId) {
        return Result.success(insOrderDeletionService.deleteOrder(insOrderId));
    }
    @Operation(summary = "成品标签打印")
@@ -287,4 +289,16 @@
        return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
    }
    @Operation(summary = "查询已完成委托单(客户满意度下拉用, 仅已检验state=4)")
    @GetMapping("/selectCompletedOrders")
    public Result selectCompletedOrders() {
        LambdaQueryWrapper<InsOrder> qw = new LambdaQueryWrapper<>();
        qw.select(InsOrder::getId, InsOrder::getEntrustCode, InsOrder::getCompany,
                        InsOrder::getCompanyId, InsOrder::getSampleView)
                .eq(InsOrder::getState, 4)
                .isNotNull(InsOrder::getCompany)
                .orderByDesc(InsOrder::getCreateTime);
        return Result.success(insOrderService.page(new Page<>(1, 500), qw).getRecords());
    }
}