From c428cfbdb79fdbb6b61ff10db62426d567e664a8 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 17 七月 2024 16:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 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..0af2a5a 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;
@@ -42,13 +42,21 @@
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
     @ValueClassify("妫�楠屼笅鍗�")
-    @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
+    @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
     @PostMapping("/selectInsOrderParameter")
     public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
         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")
@@ -58,11 +66,13 @@
     @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
     @PostMapping("/addInsOrder")
-    public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+    public Result<?> addInsOrder(String str) {
+        Map<String, Object> map = JSON.parseObject(str, Map.class);
         JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
         List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
         InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
-        return Result.success(insOrderService.addInsOrder(list, insOrder));
+        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
     }
 
     @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -70,7 +80,7 @@
     @ValueAuth
     public Result<?> selectOrderManDay(Integer id) {
         int day = insProductService.selectOrderManDay(id);
-        return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
     }
 
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -132,10 +142,41 @@
         CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
         return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
     }
+
+    @ValueAuth
+    @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
+    @PostMapping("/costStatistics2")
+    public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
+        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+        return Result.success(insOrderService.costStatistics2(costStatisticsDto));
+    }
+
     @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
     @PostMapping("/selectSampleDefects")
     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();
+    }
+
+    @PutMapping("/updateInspected")
+    @ValueAuth
+    public Result<?> updateInspected(Integer id){
+        insProductService.updateInspected(id);
+        return Result.success();
+    }
+
+    @ValueClassify("妫�楠屼笅鍗�")
+    @ApiOperation(value = "鏍囩鎵撳嵃")
+    @PostMapping("/labelPrinting")
+    public Result<?> labelPrinting(String ids) {
+        return Result.success(insOrderService.labelPrinting(ids));
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3