From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 32d48f2..b875fd4 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -1,22 +1,18 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.service.ProductionOrderService;
-import io.swagger.v3.oas.annotations.tags.Tag;
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 lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -30,7 +26,7 @@
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
+ public R<IPage<ProductionOrderVo>> page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
return R.ok(productionOrderService.pageProductionOrder(page, dto));
}
@@ -42,25 +38,35 @@
@GetMapping("/{id}")
@Operation(summary = "鐢熶骇璁㈠崟璇︽儏")
- public R<ProductionOrderVo> getInfo(@PathVariable("id") Long id) {
+ public R<ProductionOrderVo> getInfo(@PathVariable Long id) {
return R.ok(productionOrderService.getProductionOrderInfo(id));
}
- @PostMapping
- @Operation(summary = "鏂板鐢熶骇璁㈠崟")
+ @PostMapping("/addOrder")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ + "2. 鎵嬪姩鏂板锛屽繀椤讳紶 productModelId 鍜� quantity銆�"
+ + "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)))
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
- @PutMapping
+ @PutMapping("/editOrder")
@Operation(summary = "淇敼鐢熶骇璁㈠崟")
public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
+ @Operation(summary = "缁戝畾宸ヨ壓璺嚎")
+ @PostMapping("/bindingRoute")
+ public R bindingRoute(@RequestBody ProductionOrderDto productionOrderDto) {
+ return R.ok(productionOrderService.bindingRoute(productionOrderDto));
+ }
+
@PostMapping("/syncSnapshot/{id}")
@Operation(summary = "鍚屾鐢熶骇璁㈠崟宸ヨ壓/BOM蹇収")
- public R<Integer> syncSnapshot(@PathVariable("id") Long id) {
+ public R<Integer> syncSnapshot(@PathVariable Long id) {
return R.ok(productionOrderService.syncProductionOrderSnapshot(id));
}
--
Gitblit v1.9.3