From 12ee7baa78483a3077ac55cc6d11a0ebc543daf4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:06 +0800
Subject: [PATCH] 1、中空避免不出片调度修改 2、钢化指定的工程,自动取消指定规则变更 3、中空打印标签修改为只打印配对玻璃的标签

---
 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
index dcd644b..b3780cf 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
@@ -7,7 +7,7 @@
 import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
 import com.mes.hollow.entity.dto.HollowBigStorageDTO;
 import com.mes.hollow.entity.dto.LackDetailsDTO;
-import com.mes.hollow.entity.dto.OrderDetailsDTO;
+import com.mes.order.entity.OrderDetailsDTO;
 import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
 import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
 
@@ -43,6 +43,8 @@
 
     Map<Integer,List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
 
+    Map<Integer,List<LackDetailsDTO>> queryLackByFlowCardByERP(String flowCardId);
+
 
     /**
      * 鎸夌収鍘氬害鑾峰彇鐜荤拑闂撮殭
@@ -56,6 +58,6 @@
 
     OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName);
 
-    List<GlassInfo> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
+    List<LackDetailsDTO> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
 }
 

--
Gitblit v1.8.0