查询装运单打印表添加查询条件

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -652,7 +652,8 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				 heatsActualsInfo.setStacking(jsonResult);
 			 }
 
-			 // 根据铸机号、炉号查询装运单打印表
+			 // 根据铸机号、炉号、班组、班别查询装运单打印表
+			 String shiftAndShiftGroup = x.getShift() + "/" + x.getShiftGroup();
 			 String heatNo = x.getHeatNo();
 			 // 构建安全的 JSON 路径表达式
 			 String jsonPath = "$.\"" + heatNo + "\"";
@@ -660,6 +661,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 					 new QueryWrapper<StorageBillPrint>()
 							 .lambda()
 							 .eq(StorageBillPrint::getCcmNo, x.getCcmNo())
+							 .eq(StorageBillPrint::getClasses, shiftAndShiftGroup) // 新增的条件
 							 .apply("JSON_EXTRACT(heat_no, '" + jsonPath + "') IS NOT NULL")
 			 );
 			 if (oConvertUtils.listIsNotEmpty(storageBillPrintList)){