From 741918a903e17b2ec7522556d2c043b8d35dd8a1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 17:42:58 +0800
Subject: [PATCH] 生产取消bom,不合格管理定制化
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 53a22a7..0606c31 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -1,22 +1,29 @@
package com.ruoyi.production.controller;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
-import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.bean.vo.ProductionOrderWorkOrderDetailVo;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.service.ProductionOrderService;
+import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.vo.SalesLedgerVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -78,16 +85,10 @@
return R.ok(productionOrderService.getSource(id));
}
- @GetMapping("/pick/{productionOrderId}")
- @Operation(summary = "鏍规嵁璁㈠崟id鏌ヨbom棰嗘枡鍗�")
- public R<List<ProductionOrderPickVo>> pick(@PathVariable Long productionOrderId) {
- return R.ok(productionOrderService.pick(productionOrderId));
- }
-
- @GetMapping("/workOrder/detail/{productionOrderId}")
- @Operation(summary = "Query work orders/reports/inspects by production order id")
- public R<ProductionOrderWorkOrderDetailVo> getWorkOrderReportInspectDetail(@PathVariable Long productionOrderId) {
- return R.ok(productionOrderService.getWorkOrderReportInspectDetail(productionOrderId));
+ @GetMapping("/ordeDetail")
+ @Operation(summary = "鐢熶骇杩芥函")
+ public R<ProductionOrderWorkOrderDetailVo> getWorkOrderReportInspectDetail(ProductionOrderDto productionOrderDto) {
+ return R.ok(productionOrderService.getWorkOrderReportInspectDetail(productionOrderDto));
}
@Operation(summary = "鏇存柊璁㈠崟鐘舵��")
@@ -95,4 +96,14 @@
public R updateOrder(@RequestBody ProductionOrderDto productionOrderDto) {
return R.ok(productionOrderService.updateOrder(productionOrderDto));
}
+
+
+ @Log(title = "鐢熶骇璁㈠崟瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ProductionOrderDto dto) {
+ IPage<ProductionOrderVo> productionOrderVoIPage = productionOrderService.pageProductionOrder(new Page<>(-1, -1), dto);
+ List<ProductionOrderVo> records = productionOrderVoIPage.getRecords();
+ ExcelUtil<ProductionOrderVo> util = new ExcelUtil<>(ProductionOrderVo.class);
+ util.exportExcel(response, records, "鐢熶骇璁㈠崟鏁版嵁");
+ }
}
--
Gitblit v1.9.3