From 2ab6b6860e4f7bee67a0f66831b9b1fb0f420710 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 10:45:01 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 00dcabe..9558c8d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -1,18 +1,72 @@
package com.ruoyi.production.controller;
+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.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
-/**
- * <p>
- * 鐢熶骇璁㈠崟琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-21 03:55:52
- */
+import java.util.List;
+
@RestController
@RequestMapping("/productionOrder")
+@Api(tags = "鐢熶骇璁㈠崟")
+@RequiredArgsConstructor
public class ProductionOrderController {
+ private final ProductionOrderService productionOrderService;
+
+ @GetMapping("/page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
+ return R.ok(productionOrderService.pageProductionOrder(page, dto));
+ }
+
+ @GetMapping("/list")
+ @ApiOperation("鐢熶骇璁㈠崟鍒楄〃")
+ public R<List<ProductionOrderVo>> list(ProductionOrderDto dto) {
+ return R.ok(productionOrderService.listProductionOrder(dto));
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation("鐢熶骇璁㈠崟璇︽儏")
+ public R<ProductionOrderVo> getInfo(@PathVariable("id") Long id) {
+ return R.ok(productionOrderService.getProductionOrderInfo(id));
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
+ return R.ok(productionOrderService.saveProductionOrder(productionOrder));
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼鐢熶骇璁㈠崟")
+ public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
+ return R.ok(productionOrderService.saveProductionOrder(productionOrder));
+ }
+
+ @PostMapping("/syncSnapshot/{id}")
+ @ApiOperation("鍚屾鐢熶骇璁㈠崟宸ヨ壓/BOM蹇収")
+ public R<Integer> syncSnapshot(@PathVariable("id") Long id) {
+ return R.ok(productionOrderService.syncProductionOrderSnapshot(id));
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟")
+ public R<Boolean> remove(@RequestBody List<Long> ids) {
+ return R.ok(productionOrderService.removeProductionOrder(ids));
+ }
}
--
Gitblit v1.9.3