From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index eef5b98..3a3bc0c 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -15,6 +15,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
@RequestMapping("/productOrder")
@RestController
@@ -72,4 +73,27 @@
public R delete(@PathVariable("ids") Long[] ids) {
return R.ok(productOrderService.delete(ids));
}
+
+ @PatchMapping("/{id}")
+ public R finishOrder(@PathVariable Long id) {
+ return R.ok(productOrderService.finishOrder(id));
+ }
+
+ @ApiOperation("鏇存柊鐢熶骇璁㈠崟鐨勬竻鍦鸿褰�")
+ @PatchMapping("/cleanRecord/{id}")
+ public R cleanRecord(@PathVariable Long id, @RequestBody Map<String, Object> cleanRecord) {
+ return R.ok(productOrderService.cleanRecord(id, cleanRecord));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夋壒鍙�")
+ @GetMapping("/getProductOrderBatchNo")
+ public R getProductOrderBatchNo() {
+ return R.ok(productOrderService.getProductOrderBatchNo());
+ }
+
+ @ApiOperation("鐢熶骇璁㈠崟棰嗘枡鏇存柊")
+ @PostMapping("/drawMaterials")
+ public R drawMaterials(@RequestBody ProductOrderDto productOrderDto) {
+ return R.ok(productOrderService.drawMaterials(productOrderDto));
+ }
}
--
Gitblit v1.9.3