From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
index e0d3d57..febdd48 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
@@ -2,6 +2,7 @@
import com.mes.damage.entity.request.DamageRequest;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
@@ -39,14 +40,27 @@
return Result.success(hollowAllFlowCardVOList);
}
- @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
+ @ApiOperation("鐣岄潰灞曠ず锛氭煡璇㈡祦绋嬪崱銆佸眰鏁扮殑缂虹墖璇︽儏")
@PostMapping("/queryAllLackByFlowCard")
public Result<List<LackDetailsDTO>> queryAllLackByFlowCard() {
List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryAllLackByFlowCard();
return Result.success(lackDetailsList);
}
- @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
+ @ApiOperation("鎸夌収娴佺▼鍗°�佽鍗曞簭鍙枫�佸眰鍙疯幏鍙栫己鐗囩幓鐠冧俊鎭鎯�")
+ @PostMapping("/queryLackGlassByFlowCard")
+ public Result<List<LackDetailsDTO>> queryLackGlassByFlowCard(@RequestBody HollowBigStorageDetailsQueryVO query) {
+ List<LackDetailsDTO> lackGlassList = hollowGlassRelationInfoService.queryLackGlassByFlowCard(query);
+ return Result.success(lackGlassList);
+ }
+
+// @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
+// @PostMapping("/queryLackByFlowCard")
+// public Result<List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+// List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
+// return Result.success(lackDetailsList);
+// }
+ @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗＄殑缂虹墖璇︽儏")
@PostMapping("/queryLackByFlowCard")
public Result<Map<Integer,List<LackDetailsDTO>>> queryLackByFlowCard(String flowCardId) {
Map<Integer,List<LackDetailsDTO>> lackDetailsMap = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
--
Gitblit v1.8.0