From 3793ba4a9b6be8faa6df0d4a76c06763ac03f873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:06:04 +0800
Subject: [PATCH] 外购成品报检相关问题调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 21a7226..37fb641 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
@@ -35,6 +35,7 @@
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;
@@ -158,7 +159,7 @@
Integer orderId = (Integer) param.get("orderId");
String ids = (String) param.get("ids");
Integer typeSource = (Integer) param.get("typeSource");
- Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
if(Objects.nonNull(typeSource) && typeSource == 1){
ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getState,0)
@@ -182,7 +183,10 @@
@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();
}
@@ -235,8 +239,7 @@
@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鏌ヨ妫�楠岄」鏍�")
@@ -258,4 +261,20 @@
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