update01

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -711,11 +711,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		queryWrapperCS.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
 				.eq(BilletHotsendChangeShift::getShift, cacheShint)
 				.eq(BilletHotsendChangeShift::getShiftGroup, cacheShintGroup)
-				.between(BilletHotsendChangeShift::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapperCS);
+				.orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
+		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapperCS, false);
 		if (oConvertUtils.isNotEmpty(billetHotsendChangeShift)) {
 			String operationName = type.equals("hotSend")? "热送" : "热装";
-			log.info("{}{}", ">>>>>棒线统计当前班次" + operationName + "总支数:", sum + "班组：" + cacheShintGroup + "班次：" + cacheShint);
+			log.info("{}{}", ">>>>>B端当前班次信息:" + operationName + "总支数:", sum + "班组：" + cacheShintGroup + "班次：" + cacheShint);
 			billetHotsendChangeShift.setUpdateTime(new Date());
 			if ("hotSend".equals(updateType)){
 				billetHotsendChangeShift.setHotsendAmount(billetHotsendChangeShift.getHotsendAmount() + sum);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -1068,11 +1068,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         queryWrapperCS.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
                 .eq(BilletHotsendChangeShift::getShift, cacheShint)
                 .eq(BilletHotsendChangeShift::getShiftGroup, cacheShintGroup)
-                .between(BilletHotsendChangeShift::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-        BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapperCS);
+                .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
+        BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapperCS, false);
         if (oConvertUtils.isNotEmpty(billetHotsendChangeShift)) {
             String operationName = type.equals("hotSend") ? "热装" : "起跺";
-            log.info("{}{}", ">>>>>堆垛统计当前班次" + operationName + "总支数:", sum + "班组：" + cacheShintGroup + "班次：" + cacheShint);
+            log.info("{}{}", ">>>>>B端堆垛统计当前班次" + operationName + "总支数:", sum + "班组：" + cacheShintGroup + "班次：" + cacheShint);
             billetHotsendChangeShift.setUpdateTime(new Date());
             if ("hotSend".equals(type)) {
                 billetHotsendChangeShift.setHotfeignAmount(billetHotsendChangeShift.getHotfeignAmount() + sum);