Merge branch 'dgq_06/tgs_kb'

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

@@ -1566,7 +1566,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 								 .isNull(StorageBillPrint::getConfirmTime)
 								 .or(
 										 wrapper2 -> wrapper2
-												 .ge(StorageBillPrint::getArrivalTime, oConvertUtils.isEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
+												 .ge(StorageBillPrint::getArrivalTime, oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
 								 )
 				 );
 			 }else{

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -284,7 +284,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                 changeQueryWrapper.eq(BilletHotsendChangeShift::getCcmNo, queryDTO.getCcmNo()).orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
                 BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
                 // 查询确认时间为 null 或者  班次记录
-                oneQueryWrapper.ge(BilletOriginalProductRecord::getCreateTime, oConvertUtils.isEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime);
+                oneQueryWrapper.ge(BilletOriginalProductRecord::getCreateTime, oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime);
             } else {
                 // 获取当前年月日
                 Date queryDate = oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) ? queryDTO.getQueryDate() : DateUtils.getDate() ;

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

@@ -162,7 +162,7 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
                                 .isNull("confirm_time")
                                 .or(
                                         wrapper2 -> wrapper2
-                                                .ge("arrival_time", oConvertUtils.isEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
+                                                .ge("arrival_time", oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
                                 )
                 );
             } else {