From b804d88d626d1df675a3278c859b37758c55432b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 13:42:06 +0800
Subject: [PATCH] 1、增加流程卡进度查询，可根据工程号，流程卡号，玻璃id查看进度情况 2、钢化界面增加颜色对应注释，版图增加落架顺序 3、两个大理片界面笼子上色块显示修改为根据玻璃宽度显示 4、中空大理片右侧缺片情况显示优化 5、是否除膜从领取工程取消，在中空领取任务时选择除膜膜系（不除膜时不选择膜系），当配方中是需要除膜时并且选择的膜系与小片膜系一样时发送除膜信息 6、中空领取任务界面流程卡数量不等于已配对数量时高亮显示 7、磨边队列当后面玻璃磨边完成扫码但前面玻璃还未扫到码时高亮显示
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 84b8e1f..d179ad1 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,11 +40,18 @@
return Result.success(hollowAllFlowCardVOList);
}
- @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
- @PostMapping("/queryLackByFlowCard")
- public Result<List<LackDetailsDTO>> queryLackByFlowCard() {
- List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
+ @ApiOperation("鐣岄潰灞曠ず锛氭煡璇㈡祦绋嬪崱銆佸眰鏁扮殑缂虹墖璇︽儏")
+ @PostMapping("/queryAllLackByFlowCard")
+ public Result<List<LackDetailsDTO>> queryAllLackByFlowCard() {
+ List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryAllLackByFlowCard();
return Result.success(lackDetailsList);
+ }
+
+ @ApiOperation("鎸夌収娴佺▼鍗°�佽鍗曞簭鍙枫�佸眰鍙疯幏鍙栫己鐗囩幓鐠冧俊鎭鎯�")
+ @PostMapping("/queryLackGlassByFlowCard")
+ public Result<List<LackDetailsDTO>> queryLackGlassByFlowCard(@RequestBody HollowBigStorageDetailsQueryVO query) {
+ List<LackDetailsDTO> lackGlassList = hollowGlassRelationInfoService.queryLackGlassByFlowCard(query);
+ return Result.success(lackGlassList);
}
// @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
@@ -52,6 +60,19 @@
// List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
// return Result.success(lackDetailsList);
// }
+ @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗＄殑缂虹墖璇︽儏")
+ @PostMapping("/queryLackByFlowCardByERP")
+ public Result<Map<Integer,List<LackDetailsDTO>>> queryLackByFlowCard(String flowCardId) {
+ Map<Integer,List<LackDetailsDTO>> lackDetailsMap = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId);
+ return Result.success(lackDetailsMap);
+ }
+
+ @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗＄殑缂虹墖璇︽儏")
+ @PostMapping("/queryLackByFlowCard")
+ public Result<Map<Integer,List<LackDetailsDTO>>> queryLackByFlowCardByERP(String flowCardId) {
+ Map<Integer,List<LackDetailsDTO>> lackDetailsMap = hollowGlassRelationInfoService.queryLackByFlowCardByERP(flowCardId);
+ return Result.success(lackDetailsMap);
+ }
@ApiOperation("涓┖缂虹墖鐖嗙牬绗兼姤鐮存崯")
@PostMapping("/hollowBigStorageGlassDamage")
--
Gitblit v1.8.0