From 5a90ac8955f198f21954a3dca0443d1c5892bf0b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 03 十一月 2026 18:08:29 +0800
Subject: [PATCH] 成品下单批量下单接口与检验委托单批次合并（batch_no），含数据库加列脚本
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index a7ddb11..050bc5d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/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;
@@ -84,6 +90,19 @@
return Result.success(insOrderService.addNewJuInsOrder(insPlaceOrderDto));
}
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
+ }
+
+ @Operation(summary = "鎵归噺娣诲姞鏂拌仛妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/addBatchNewJuInsOrder")
+ public Result<?> addBatchNewJuInsOrder(@RequestBody InsBatchPlaceOrderDto insBatchPlaceOrderDto) {
+ return Result.success(insOrderService.addBatchNewJuInsOrder(insBatchPlaceOrderDto));
+ }
+
+ @Operation(summary = "淇敼鏂拌仛妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/updateNewJuInsOrder")
+ public Result<?> updateNewJuInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.updateNewJuInsOrder(insPlaceOrderDto));
}
@Operation(summary = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -221,16 +240,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 = "鎴愬搧鏍囩鎵撳嵃")
@@ -281,4 +296,16 @@
return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
}
+ @Operation(summary = "鏌ヨ宸插畬鎴愬鎵樺崟(瀹㈡埛婊℃剰搴︿笅鎷夌敤, 浠呭凡妫�楠宻tate=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());
+ }
+
}
--
Gitblit v1.9.3