From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 22fd71f..6623aef 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -31,7 +31,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
-@Api("妫�楠屽崟妯″潡")
+@Api(tags="妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
@@ -49,6 +49,14 @@
SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏄惁鍏ㄩ儴鏌ヨ")
+ @PostMapping("/selectAllInsOrder")
+ public Result selectAllInsOrder(){
+ return Result.success();
+ }
+
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "妫�楠屽垎閰�")
@PostMapping("/upInsOrder")
@@ -138,4 +146,19 @@
public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
}
-}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鎾ら攢")
+ @PutMapping("/updateStatus")
+ public Result<?> updateStatus(Integer id) {
+ insOrderService.updateStatus(id);
+ return Result.success();
+ }
+ @ValueClassify("妫�楠屼笅鍗�")
+ @PutMapping("/updateInspected")
+ @ValueAuth
+ public Result<?> updateInspected(Integer id){
+ insProductService.updateInspected(id);
+ return Result.success();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3