update

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -1835,6 +1835,50 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		return Result.OK(result);
 	}
 
+	@ApiOperation(value="当班炉次浇筑信息查询", notes="当班炉次浇筑信息查询")
+	@GetMapping(value = "/queryHeatsActualsByCcmNo")
+	public Result<List<HeatsActualsInfo>> queryHeatsActualsByCcmNo(@RequestParam(name="ccmNo") String ccmNo) {
+		List<HeatsActualsInfo> heatsActualsInfoList = new ArrayList<>();
+
+		String classShiftGroup = String.format("class:shift:group:%s", ccmNo); // 班组
+		String classShift = String.format("class:shift:%s",ccmNo); // 班别
+		String shift = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)) : "";
+		String shiftGroup = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)) : "";
+		// 根据ccmNo、shift、shiftGroup查询最新的交班记录
+		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
+				.eq(BilletHotsendChangeShift::getShift, shift)
+				.eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
+				.isNotNull(BilletHotsendChangeShift::getChangeShiftTime)
+				.orderByDesc(BilletHotsendChangeShift::getChangeShiftTime)
+				.last("limit 1");
+		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
+		if (billetHotsendChangeShift ==	null){
+			return Result.OK(heatsActualsInfoList);
+		}
+		//根据ccmNo、shift、shiftGroup、大于billetHotsendChangeShift的创建时间 查询所有炉次传递单BilletHotsend
+		LambdaQueryWrapper<BilletHotsend> queryWrapper1 = new LambdaQueryWrapper<>();
+		queryWrapper1.eq(BilletHotsend::getCcmNo, ccmNo)
+				.eq(BilletHotsend::getShift, shift)
+				.eq(BilletHotsend::getShiftGroup, shiftGroup)
+				.between(BilletHotsend::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date())
+				.orderByDesc(BilletHotsend::getCreateTime);
+		List<BilletHotsend> billetHotsendList = billetHotsendBaseService.list(queryWrapper1);
+		if (oConvertUtils.listIsEmpty(billetHotsendList)){
+			return Result.OK(heatsActualsInfoList);
+		}
+		billetHotsendList.forEach(x -> {
+			HeatsActualsInfo heatsActualsInfo = new HeatsActualsInfo();
+			heatsActualsInfo.setHeatNo(x.getHeatNo());
+
+
+
+		});
+
+
+		return Result.OK(heatsActualsInfoList);
+	}
+
 	/**
 	 * 生成综合唯一编码
 	 * @param  date

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/HeatsActualsInfo.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.billet.storageBill.entity;
+
+import lombok.Data;
+
+@Data
+public class HeatsActualsInfo {
+
+    private String id;
+    private String heatNo;
+    private String brandNum;
+
+    private String oneStrandNo;
+    private String twoStrandNo;
+    private String threeStrandNo;
+    private String fourStrandNo;
+    private String fiveStrandNo;
+    private String sixStrandNo;
+    private String sevenStrandNo;
+    private String eightStrandNo;
+
+    private String directRolling;
+
+    private String hotCharge;
+
+    private String stacking;
+
+    private String length;
+
+    private String totalInfo;
+
+}