From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 566 +++++++++++++++++++++++++------------------------------
1 files changed, 259 insertions(+), 307 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index a0cec57..2f95736 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -1,307 +1,259 @@
-//package com.ruoyi.basic.controller;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
-//import com.ruoyi.common.core.domain.Result;
-//import com.ruoyi.inspect.dto.OmitOrderProductDto;
-//import com.ruoyi.inspect.dto.SampleOrderDto;
-//import com.ruoyi.inspect.service.InsOrderService;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiImplicitParams;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletResponse;
-//import java.time.LocalDateTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Objects;
-//
-//@RestController
-//@AllArgsConstructor
-//@RequestMapping("/insOrder")
-//@Api(tags="妫�楠屽崟妯″潡")
-//public class InsOrderController {
-//
-// private InsOrderService insOrderService;
-//
-// private InsSampleService insSampleService;
-//
-// private InsProductService insProductService;
-//
-// private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
-//
-// private InsOrderTemplateService insOrderTemplateService;
-//
-// //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-// @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));
-// }
-//
-// //鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
-// @ApiOperation(value = "鏌ヨ鎵�鏈夋楠屽崟")
-// @PostMapping("/selectAllInsOrderParameter")
-// public Result selectAllInsOrderParameter() {
-// return Result.success();
-// }
-//
-//
-// @ApiOperation(value = "妫�楠屽垎閰�")
-// @PostMapping("/upInsOrder")
-// public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
-// return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
-// }
-//
-// @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
-// @PostMapping("/addInsOrder")
-// 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);
-// List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
-// return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
-// }
-//
-// @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
-// @PostMapping("/selectOrderManDay")
-// public Result<?> selectOrderManDay(Integer id) {
-// int day = insProductService.selectOrderManDay(id);
-// return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-// }
-//
-// @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
-// @PostMapping("/getInsOrder")
-// public Result<?> getInsOrder(Integer orderId) {
-// return Result.success(insOrderService.getInsOrder(orderId));
-// }
-// @ValueClassify("妫�楠屼笅鍗�")
-// @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
-// @ApiImplicitParams({
-// @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
-// @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
-// })
-//
-// @PostMapping("/upInsOrderOfState")
-// public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
-// return Result.success(insOrderService.upInsOrderOfState(insOrder));
-// }
-//
-// @ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
-// @PostMapping("/addInsOrderTemplate")
-// public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
-// return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
-// }
-//
-// @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
-// @GetMapping("/selectInsOrderTemplate")
-// public Result<?> selectInsOrderTemplate(String company) {
-// return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
-// }
-//
-// @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
-// @PostMapping("/selectInsOrderTemplateById")
-// public Result<?> selectInsOrderTemplateById(Integer id) {
-// return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
-// }
-//
-// @ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
-// @PostMapping("/delInsOrderTemplate")
-// public Result<?> delInsOrderTemplate(Integer id) {
-// return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
-// }
-//
-// @ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
-// @PostMapping("/selectSampleAndProductByOrderId")
-// public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
-// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-// SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
-// return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
-// }
-//
-// @ApiOperation(value = "璐圭敤缁熻")
-// @PostMapping("/costStatistics")
-// public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
-// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-// CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
-// return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
-// }
-//
-// @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));
-// }
-//
-//
-// @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));
-// }
-//
-//
-// @ApiOperation(value = "鎾ら攢")
-// @PutMapping("/updateStatus")
-// public Result<?> updateStatus(Integer id) {
-// insOrderService.updateStatus(id);
-// return Result.success();
-// }
-//
-// //寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
-// @PostMapping("/selectNoProducts")
-// public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
-// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-// InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
-// return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
-// }
-//
-//
-// @ApiOperation(value = "寰呮鐨勬挙閿�")
-// @PutMapping("/updateInspected")
-// public Result<?> updateInspected(Integer orderId, String ids,
-// @RequestParam(value = "typeSource",required = false) Integer typeSource,
-// @RequestParam(value = "ifsInventoryId",required = false) Integer ifsInventoryId){
-// if(Objects.nonNull(typeSource) && typeSource == 1){
-// ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
-// .set(IfsInventoryQuantity::getState,0)
-// .eq(IfsInventoryQuantity::getId,ifsInventoryId));
-// insOrderService.update(null,new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState,-1).eq(InsOrder::getId,orderId)); // 鎾ら攢
-// }
-// insProductService.updateInspected(orderId,ids);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
-// @PostMapping("/checkUpdate")
-// public Result<?> checkUpdate(Integer orderId,Integer state){
-// insProductService.checkUpdate(orderId,state);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "鏍囩鎵撳嵃")
-// @PostMapping("/labelPrinting")
-// public Result<?> labelPrinting(String ids) {
-// return Result.success(insOrderService.labelPrinting(ids));
-// }
-//
-//
-// @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
-// @PostMapping("/export")
-// public void export(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
-// CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
-// insOrderService.export(costStatisticsDto,response);
-// }
-//
-//
-// @ApiOperation(value = "鑾峰彇ifs璁㈠崟")
-// @PostMapping("/getIfsOrder")
-// public Result<?> getIfsOrder() {
-// insOrderService.getIfsOrder();
-// return Result.success();
-// }
-//
-// @Scheduled(fixedDelay = 1200000)
-// public void getIfsOrderTiming() {
-// insOrderService.getIfsOrder();
-// }
-//
-//
-// @ApiOperation(value = "淇敼璁㈠崟鍗曞彿")
-// @PostMapping("/updateEntrustCode")
-// public Result<?> updateEntrustCode(@RequestBody InsOrder insOrder) {
-// insOrderService.updateEntrustCode(insOrder);
-// return Result.success();
-// }
-//
-// @ApiOperation("鏌ヨ涓嶅悎鏍煎娴嬩俊鎭�")
-// @GetMapping("/getRetestResult")
-// public Result<?> getRetestResult(Integer insProductId) {
-// return Result.success(insOrderService.getRetestResult(insProductId));
-// }
-//
-//
-//
-// @ApiOperation(value = "閾滃崟涓濅笅鍗�")
-// @PostMapping("/addRawCopperOrder")
-// public Result<?> addRawCopperOrder(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);
-// CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
-// return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
-// }
-//
-//
-// @ApiOperation(value = "淇敼濮旀墭缂栧彿")
-// @PostMapping("/updateOrderEntrustCode")
-// public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
-// insOrderService.updateOrderEntrustCode(insOrder);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "淇敼妫�楠屼笅鍗曞唴瀹�")
-// @PostMapping("/updateInsOrder")
-// public Result<?> updateInsOrder(@RequestBody InsOrderUpdateDto insOrderUpdateDto) {
-// return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
-// }
-//
-// @ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
-// @GetMapping("/delInsOrder")
-// public Result<?> delInsOrder(Integer insOrderId) {
-// // 鏌ヨ璁㈠崟
-// InsOrder order = insOrderService.getById(insOrderId);
-// if (!order.getState().equals(2)) {
-// throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
-// }
-//
-// return Result.success(insOrderService.removeById(insOrderId));
-// }
-//
-// @ApiOperation(value = "鎴愬搧鏍囩鎵撳嵃")
-// @PostMapping("/labelOrderPrinting")
-// public Result<List<InsOrderPrintingVo>> labelOrderPrinting(@RequestBody Map<String, Object> param) {
-// List<Integer> ids = (List<Integer>) param.get("ids");
-// return Result.success(insOrderService.labelOrderPrinting(ids));
-// }
-//
-// @ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
-// @GetMapping("/getSampleByOrderId")
-// public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
-// return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
-// .eq(InsSample::getInsOrderId, insOrderId)));
-// }
-//
-// @ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
-// @GetMapping("/getProductTreeBySampleId")
-// public Result<List<StandardProductList>> getProductTreeBySampleId(Integer insSampleId) {
-// return Result.success(insOrderService.getProductTreeBySampleId(insSampleId));
-// }
-//
-//
-// @ApiOperation(value = "娣诲姞閬楁紡鐨勬楠岄」")
-// @PostMapping("/addOmitOrderProduct")
-// public Result addOmitOrderProduct(@RequestBody OmitOrderProductDto omitOrderProductDto) {
-// return Result.success(insOrderService.addOmitOrderProduct(omitOrderProductDto));
-// }
-//
-// @ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
-// @PostMapping("/rawAllInsOrderExport")
-// public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
-// insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
-// }
-//
-//}
+package com.ruoyi.inspect.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
+import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.dto.*;
+import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsOrderTemplate;
+import com.ruoyi.inspect.pojo.InsProduct;
+import com.ruoyi.inspect.pojo.InsSample;
+import com.ruoyi.inspect.service.InsOrderService;
+import com.ruoyi.inspect.service.InsOrderTemplateService;
+import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.inspect.service.InsSampleService;
+import com.ruoyi.inspect.vo.InsOrderPrintingVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/insOrder")
+@Api(tags="妫�楠屽崟妯″潡")
+public class InsOrderController {
+
+ private InsOrderService insOrderService;
+
+ private InsSampleService insSampleService;
+
+ private InsProductService insProductService;
+
+ private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
+
+ private InsOrderTemplateService insOrderTemplateService;
+
+ //鑾峰彇妫�楠屼笅鍗曟暟鎹�
+ @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
+ @GetMapping("/selectInsOrderParameter")
+ public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
+ return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
+ }
+
+ //鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋楠屽崟")
+ @GetMapping("/selectAllInsOrderParameter")
+ public Result selectAllInsOrderParameter() {
+ return Result.success();
+ }
+
+
+ @ApiOperation(value = "妫�楠屽垎閰�")
+ @PostMapping("/upInsOrder")
+ public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
+ return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
+ }
+
+ @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/addInsOrder")
+ public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
+ }
+
+ @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
+ @GetMapping("/selectOrderManDay")
+ public Result<?> selectOrderManDay(Integer id) {
+ int day = insProductService.selectOrderManDay(id);
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
+ @GetMapping("/getInsOrder")
+ public Result<?> getInsOrder(Integer orderId) {
+ return Result.success(insOrderService.getInsOrder(orderId));
+ }
+
+ @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
+ })
+ @PostMapping("/upInsOrderOfState")
+ public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
+ return Result.success(insOrderService.upInsOrderOfState(insOrder));
+ }
+
+ @ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
+ @PostMapping("/addInsOrderTemplate")
+ public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
+ return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
+ @GetMapping("/selectInsOrderTemplate")
+ public Result<?> selectInsOrderTemplate(String company) {
+ return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
+ @GetMapping("/selectInsOrderTemplateById")
+ public Result<?> selectInsOrderTemplateById(Integer id) {
+ return Result.success(insOrderTemplateService.selectInsOrderTemplateById(id));
+ }
+
+ @ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
+ @DeleteMapping("/delInsOrderTemplate")
+ public Result<?> delInsOrderTemplate(Integer id) {
+ return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
+ }
+
+ @ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
+ @GetMapping("/selectSampleAndProductByOrderId")
+ public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto){
+ return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
+ }
+
+
+ @ApiOperation(value = "鎾ら攢")
+ @PostMapping("/updateStatus")
+ public Result<?> updateStatus(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ insOrderService.updateStatus(id);
+ return Result.success();
+ }
+
+ //寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
+ @GetMapping("/selectNoProducts")
+ public Result<?> selectNoProducts(Page page, InsProduct insProduct,Integer orderId ,String ids){
+ return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
+ }
+
+
+ @ApiOperation(value = "寰呮鐨勬挙閿�")
+ @PostMapping("/updateInspected")
+ public Result<?> updateInspected(@RequestBody Map<String, Object> param){
+ Integer orderId = (Integer) param.get("orderId");
+ String ids = (String) param.get("ids");
+ Integer typeSource = (Integer) param.get("typeSource");
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ if(Objects.nonNull(typeSource) && typeSource == 1){
+ ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
+ .set(IfsInventoryQuantity::getState,0)
+ .eq(IfsInventoryQuantity::getId,ifsInventoryId));
+ insOrderService.update(null,new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState,-1).eq(InsOrder::getId,orderId)); // 鎾ら攢
+ }
+ insProductService.updateInspected(orderId,ids);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
+ @PostMapping("/checkUpdate")
+ public Result<?> checkUpdate(@RequestBody Map<String, Object> param){
+ Integer orderId = (Integer) param.get("orderId");
+ Integer state = (Integer) param.get("state");
+ insProductService.checkUpdate(orderId,state);
+ return Result.success();
+ }
+
+
+ @ApiOperation(value = "鑾峰彇ifs璁㈠崟")
+ @GetMapping("/getIfsOrder")
+ public Result<?> getIfsOrder() {
+ insOrderService.getIfsOrder();
+ return Result.success();
+ }
+
+
+ @ApiOperation(value = "淇敼璁㈠崟鍗曞彿")
+ @PostMapping("/updateEntrustCode")
+ public Result<?> updateEntrustCode(@RequestBody InsOrder insOrder) {
+ insOrderService.updateEntrustCode(insOrder);
+ return Result.success();
+ }
+
+ @ApiOperation("鏌ヨ涓嶅悎鏍煎娴嬩俊鎭�")
+ @GetMapping("/getRetestResult")
+ public Result<?> getRetestResult(Integer insProductId) {
+ return Result.success(insOrderService.getRetestResult(insProductId));
+ }
+
+ @ApiOperation(value = "淇敼濮旀墭缂栧彿")
+ @PostMapping("/updateOrderEntrustCode")
+ public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
+ insOrderService.updateOrderEntrustCode(insOrder);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "淇敼妫�楠屼笅鍗曞唴瀹�")
+ @PostMapping("/updateInsOrder")
+ public Result<?> updateInsOrder(@RequestBody InsOrderUpdateDto insOrderUpdateDto) {
+ return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
+ }
+
+ @ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
+ @DeleteMapping("/delInsOrder")
+ public Result<?> delInsOrder(Integer insOrderId) {
+ // 鏌ヨ璁㈠崟
+ InsOrder order = insOrderService.getById(insOrderId);
+ if (!order.getState().equals(2)) {
+ throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
+ }
+
+ return Result.success(insOrderService.removeById(insOrderId));
+ }
+
+ @ApiOperation(value = "鎴愬搧鏍囩鎵撳嵃")
+ @PostMapping("/labelOrderPrinting")
+ public Result<List<InsOrderPrintingVo>> labelOrderPrinting(@RequestBody Map<String, Object> param) {
+ List<Integer> ids = (List<Integer>) param.get("ids");
+ return Result.success(insOrderService.labelOrderPrinting(ids));
+ }
+
+ @ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
+ @GetMapping("/getSampleByOrderId")
+ public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
+ return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, insOrderId)));
+ }
+
+ @ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
+ @GetMapping("/getProductTreeBySampleId")
+ public Result<List<StandardProductList>> getProductTreeBySampleId(Integer insSampleId) {
+ return Result.success(insOrderService.getProductTreeBySampleId(insSampleId));
+ }
+
+
+ @ApiOperation(value = "娣诲姞閬楁紡鐨勬楠岄」")
+ @PostMapping("/addOmitOrderProduct")
+ public Result addOmitOrderProduct(@RequestBody OmitOrderProductDto omitOrderProductDto) {
+ return Result.success(insOrderService.addOmitOrderProduct(omitOrderProductDto));
+ }
+
+ @ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
+ @PostMapping("/rawAllInsOrderExport")
+ public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+ insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
+ }
+
+}
--
Gitblit v1.9.3