From 027c21867ac838a35d9b29b5c138bc59e4cfbca3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:31:46 +0800
Subject: [PATCH] yys 修改word模板

---
 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java |   65 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 347696b..7ef8737 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.inspect.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
@@ -14,7 +15,11 @@
 import com.ruoyi.inspect.pojo.InsProduct;
 import com.ruoyi.inspect.service.InsOrderFileService;
 import com.ruoyi.inspect.service.InsOrderPlanService;
+import com.ruoyi.inspect.service.InsOrderRatesService;
 import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -36,10 +41,9 @@
 public class InsOrderPlanController {
 
     private InsOrderPlanService insOrderPlanService;
-
     private InsOrderFileService insOrderFileService;
-
     private InsProductService insProductService;
+    private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;
 
 
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -110,8 +114,7 @@
     @ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
     @PostMapping("/saveInsContext")
     public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
-        Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
-        insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
+        insOrderPlanService.saveInsContext(saveInsContextDto);
         return Result.success();
     }
 
@@ -173,40 +176,27 @@
         return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
     }
 
-    @ApiOperation("鑾峰彇涓嶅悎鏍兼暟鎹�")
-    @GetMapping("/getInsProductUnqualified")
-    public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
-        return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
-    }
-
     @ApiOperation("鏂板涓嶅悎鏍煎娴嬩俊鎭�")
     @PostMapping("/addUnqualifiedRetest")
-    public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
-        // 鑾峰彇妫�楠屽璞＄殑id
-        List<Integer> ids = (List<Integer>) params.get("ids");
-        return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
+    public Result<?> addDisqualificationRetest(@RequestBody List<InsProduct> insProductsList) {
+        return Result.success(insOrderPlanService.addDisqualificationRetest(insProductsList));
     }
 
     @ApiOperation("鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�")
     @GetMapping("/getInsProductUnqualifiedRetest")
-    public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
-        return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
+    public Result<?> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto) {
+        return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(insOrderPlanProductDto));
     }
 
     /**
      *
-     * @param param 妯℃澘鍐呭
-     * @param currentTable 褰撳墠妯℃澘id
-     * @param sampleId 褰撳墠鏍峰搧id
-     * @param orderId 褰撳墠璁㈠崟id
-     * @param sonLaboratory 瀛愯瘯楠屽
      * @return
      */
-    @ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
+    @ApiOperation(value = "淇濆瓨 涓嶅悎鏍煎娴嬫楠屽唴瀹�")
     @PostMapping("/saveUnqualifiedContext")
-    public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
-        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
-        insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+    public Result<?> saveUnqualifiedContext(@RequestBody SaveInsContextDto saveInsContextDto) {
+        Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
+        insOrderPlanService.saveUnqualifiedContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
         return Result.success();
     }
 
@@ -253,7 +243,8 @@
     @GetMapping("/getBindingProductByProductId")
     public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
         return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
-                .eq(InsProduct::getBindingProductId, productId)));
+                .eq(InsProduct::getBindingProductId, productId)
+                .orderByAsc(InsProduct::getSort)));
     }
 
 
@@ -263,4 +254,26 @@
     public Result<?> delProductTreeByProductId(Integer productId) {
         return Result.success(insProductService.removeBindingProductTree(productId));
     }
+
+    /**
+     * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+     * @return
+     */
+    @ApiOperation(value = "鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏")
+    @PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
+    @GetMapping("/getWorkingHoursByOrderId")
+    public Result<IPage<AuxiliaryOutputWorkingHoursTemporaryDto>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporaryDto workingHoursTemporary) {
+        return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
+    }
+
+    /**
+     * 淇敼宸ユ椂璇︽儏
+     * @return
+     */
+    @ApiOperation(value = "淇敼宸ユ椂璇︽儏")
+    @PreAuthorize("@ss.hasPermi('update:order:workingHours')")
+    @PostMapping("/updateWorkingHours")
+    public Result updateWorkingHours(@RequestBody AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+        return Result.success(auxiliaryOutputWorkingHoursTemporaryService.updateById(workingHoursTemporary));
+    }
 }

--
Gitblit v1.9.3