|
|
@@ -18,9 +18,12 @@ import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
|
|
|
import org.jeecg.modules.actualControl.heatsActuals.service.IHeatsActualsService;
|
|
|
+import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
|
|
|
import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
|
|
|
+import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
|
|
|
import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
|
|
|
import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
|
|
|
+import org.jeecg.modules.billet.pm.service.IBilletHotsendHostService;
|
|
|
import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
|
|
|
import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
|
|
|
import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
|
|
|
@@ -92,6 +95,9 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
|
|
|
@Autowired
|
|
|
private IHeatsActualsService heatsActualsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IBilletHotsendBaseService billetHotsendBaseService;
|
|
|
+
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
*
|
|
|
@@ -536,6 +542,26 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
|
|
|
heatsQueryWrapper.eq("shiftGroup", storageBill.getShiftGroup());
|
|
|
}
|
|
|
|
|
|
+ QueryWrapper<BilletHotsend> billetHotsendQueryWrapper = new QueryWrapper<>();
|
|
|
+ billetHotsendQueryWrapper
|
|
|
+ .gt("rollclubtwo_num", 0)
|
|
|
+ .or()
|
|
|
+ .gt("rollclubthree_num", 0)
|
|
|
+ .or()
|
|
|
+ .gt("rolloutshipp_num", 0);
|
|
|
+
|
|
|
+ List<BilletHotsend> billetHotsendList = billetHotsendBaseService.list(billetHotsendQueryWrapper);
|
|
|
+
|
|
|
+ List<String> hostNoList = billetHotsendList.stream()
|
|
|
+ .map(BilletHotsend::getHeatNo)
|
|
|
+ .filter(Objects::nonNull) // 避免 null 值
|
|
|
+ .distinct() // 去重，提升查询效率
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ if (!hostNoList.isEmpty()) {
|
|
|
+ heatsQueryWrapper.in("heats_code", hostNoList);
|
|
|
+ }
|
|
|
+
|
|
|
List<HeatsActuals> actualsList = heatsActualsService.list(heatsQueryWrapper);
|
|
|
// 分页查询 HeatsActuals
|
|
|
Page<HeatsActuals> heatsPage = new Page<>(pageNo, pageSize);
|
