From 6f507a2a6ff037346b052b2b7ce96ab2910c9735 Mon Sep 17 00:00:00 2001
From: deslrey <deslre0381@gmail.com>
Date: 星期一, 12 一月 2026 11:53:35 +0800
Subject: [PATCH] 外购订单的标签打印功能查询接口及查询
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 59 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 bda6f2e..2fdf20a 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,15 +1,12 @@
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.dto.InventoryDetailDTO;
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;
@@ -26,14 +23,13 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.access.prepost.PreAuthorize;
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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -41,7 +37,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
-@Api(tags="妫�楠屽崟妯″潡")
+@Api(tags = "妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
@@ -71,11 +67,12 @@
@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));
+ 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 = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
@@ -85,7 +82,7 @@
@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")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -99,7 +96,6 @@
@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));
@@ -120,7 +116,7 @@
@ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
@GetMapping("/selectInsOrderTemplateById")
public Result<?> selectInsOrderTemplateById(Integer id) {
- return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
+ return Result.success(insOrderTemplateService.selectInsOrderTemplateById(id));
}
@ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
@@ -131,27 +127,8 @@
@ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
@GetMapping("/selectSampleAndProductByOrderId")
- public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto){
+ public Result<?> selectSampleAndProductByOrderId(Page page, SampleProductDto2 sampleProductDto) {
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻")
- @GetMapping("/costStatistics")
- public Result<?> costStatistics(Page page, CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
- @GetMapping("/costStatistics2")
- public Result<?> costStatistics2(CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics2(costStatisticsDto));
- }
-
-
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
- @GetMapping("/selectSampleDefects")
- public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
- return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
}
@@ -165,49 +142,45 @@
//寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
@GetMapping("/selectNoProducts")
- public Result<?> selectNoProducts(Page page, InsProduct insProduct,Integer orderId ,String ids){
- return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
+ 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){
+ 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)); // 鎾ら攢
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
+ 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);
+ insProductService.updateInspected(orderId, ids);
return Result.success();
}
@ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
@PostMapping("/checkUpdate")
- public Result<?> checkUpdate(@RequestBody Map<String, Object> param){
+ public Result<?> checkUpdate(@RequestBody Map<String, Object> param) {
Integer orderId = (Integer) param.get("orderId");
Integer state = (Integer) param.get("state");
- insProductService.checkUpdate(orderId,state);
+ insProductService.checkUpdate(orderId, state);
return Result.success();
- }
-
-
- @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
- @GetMapping("/export")
- public void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response) throws ServletException, IOException {
- insOrderService.export(costStatisticsDto,response);
}
@ApiOperation(value = "鑾峰彇ifs璁㈠崟")
@GetMapping("/getIfsOrder")
public Result<?> getIfsOrder() {
- insOrderService.getIfsOrder();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("LOCATION_NO", "1302;WG-04-001");
+ map.put("STATE_DB", "To be Inspected");
+ insOrderService.getIfsOrder(map, false);
return Result.success();
}
@@ -243,7 +216,7 @@
public Result<?> delInsOrder(Integer insOrderId) {
// 鏌ヨ璁㈠崟
InsOrder order = insOrderService.getById(insOrderId);
- if (!order.getState().equals(2)) {
+ if (!(order.getState().equals(2) || order.getState().equals(3))) {
throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
}
@@ -257,11 +230,17 @@
return Result.success(insOrderService.labelOrderPrinting(ids));
}
+ @ApiOperation(value = "澶栬喘涓嬪崟鎴愬搧鏍囩鎵撳嵃")
+ @PostMapping("/labelOutsideOrderPrinting")
+ public Result<List<InventoryDetailDTO>> labelOutsideOrderPrinting(@RequestBody Map<String, Object> param) {
+ List<Integer> ids = (List<Integer>) param.get("ids");
+ return Result.success(insOrderService.labelOutsideOrderPrinting(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)));
+ return Result.success(insSampleService.getSampleByOrderId(insOrderId));
}
@ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
@@ -278,9 +257,25 @@
}
@ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllInsOrderExport")
- public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
- insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
+ @GetMapping("/rawAllInsOrderExport")
+ public void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response) {
+ insOrderService.rawAllInsOrderExport(sampleOrderDto, response);
+ }
+
+
+ @ApiOperation(value = "淇敼鏍峰搧鍨嬪彿")
+ @PostMapping("/updateSampleModel")
+ public Result<?> updateSampleModel(@RequestBody List<InsSample> insSampleList) {
+ for (InsSample insSample : insSampleList) {
+ insOrderService.updateSampleModel(insSample);
+ }
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�")
+ @PostMapping("/judgeNotSpotCheckOrder")
+ public Result<?> judgeNotSpotCheckOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
}
}
--
Gitblit v1.9.3