From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index b875fd4..0a68875 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -1,19 +1,30 @@
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
@@ -43,18 +54,11 @@
}
@PostMapping("/addOrder")
- @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
- + "2. 鎵嬪姩鏂板锛屽繀椤讳紶 productModelId 鍜� quantity銆�"
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸�1绉嶆柟寮忥細鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ "technologyRoutingId 涓虹┖鏃朵細鑷姩鍖归厤璇ヤ骇鍝佽鏍兼渶鏂板伐鑹鸿矾绾匡紝quantity 鏈�缁堝繀椤诲ぇ浜� 0銆�")
@io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, description = "鍓嶇鍙嬪ソ鎻愮ず锛氬鏋滄槸鐢熶骇璁″垝鐢熸垚锛岃浼� productionPlanIds锛�"
- + "濡傛灉鏄墜鍔ㄦ柊澧烇紝璇疯嚦灏戝～鍐� productModelId銆乹uantity锛屼笖 quantity 蹇呴』澶т簬 0銆�", content = @Content(schema = @Schema(implementation = ProductionOrder.class)))
+ , content = @Content(schema = @Schema(implementation = ProductionOrder.class)))
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
- return R.ok(productionOrderService.saveProductionOrder(productionOrder));
- }
-
- @PutMapping("/editOrder")
- @Operation(summary = "淇敼鐢熶骇璁㈠崟")
- public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
@@ -75,4 +79,38 @@
public R<Boolean> remove(@RequestBody List<Long> ids) {
return R.ok(productionOrderService.removeProductionOrder(ids));
}
+
+ @GetMapping("/source/{id}")
+ @Operation(summary = "鐢熶骇璁㈠崟鏌ヨ鏉ユ簮")
+ public R<List<ProductionPlanVo>> getSource(@PathVariable Long id) {
+ 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("/ordeDetail")
+ @Operation(summary = "鐢熶骇杩芥函")
+ public R<ProductionOrderWorkOrderDetailVo> getWorkOrderReportInspectDetail(ProductionOrderDto productionOrderDto) {
+ return R.ok(productionOrderService.getWorkOrderReportInspectDetail(productionOrderDto));
+ }
+
+ @Operation(summary = "鏇存柊璁㈠崟鐘舵��")
+ @PostMapping("/updateOrder")
+ 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