Merge remote-tracking branch 'origin/master'

吴羡

10 天以前 1c52e77d77d0e924a1df0725c0748afde172ad68

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java

@@ -15,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;
@@ -40,6 +43,8 @@
public class InsOrderController {

    private InsOrderService insOrderService;

    private InsOrderDeletionService insOrderDeletionService;

    private InsSampleService insSampleService;

@@ -228,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 = "成品标签打印")