成品下单批量下单接口与检验委托单批次合并（batch_no），含数据库加列脚本

吴羡

6 天以前 5a90ac8955f198f21954a3dca0443d1c5892bf0b

 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;

@@ -85,6 +90,13 @@
            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 = "修改新聚检验下单数据")
@@ -228,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 = "成品标签打印")