棒三工作台

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

@@ -1465,11 +1465,28 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 search = false;
 		 }
 		 if ((oConvertUtils.isNotEmpty(queryDate)) || search == true) { // 独立时间处理
-			 // 获取当前年月日
-			 queryDate = oConvertUtils.isNotEmpty(queryDate) ? queryDate : DateUtils.getDate("yyyy-MM-dd");
-			 Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
-			 Date endTime = DateUtils.getEndOfDayByDate(startTime);
-			 queryWrapper.between(StorageBillPrint::getArrivalTime, startTime, endTime);
+			 // 如果时间给了空
+			 if(oConvertUtils.isEmpty(queryDate)) { // 查询最后一个班次
+				 String nowDate = DateUtils.getDate("yyyy-MM-dd");
+				 Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(nowDate));
+				 // 查询最后一次交班记录时间
+				 LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+				 changeQueryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo).orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
+				 BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
+				 // 查询确认时间为 null 或者  班次记录
+				 queryWrapper.and(wrapper ->
+						 wrapper
+								 .isNull(StorageBillPrint::getConfirmTime)
+								 .or(
+										 wrapper2 -> wrapper2
+												 .ge(StorageBillPrint::getArrivalTime, oConvertUtils.isEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
+								 )
+				 );
+			 }else{
+				 Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
+				 Date endTime = DateUtils.getEndOfDayByDate(startTime);
+				 queryWrapper.between(StorageBillPrint::getArrivalTime, startTime, endTime);
+			 }
 		 }
 		 // 炉号查询
 		 if (oConvertUtils.isNotEmpty(heatNo)) {

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

@@ -275,13 +275,24 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
         }
 
         if(oConvertUtils.isNotEmpty(queryDTO.getQueryDate())  || search == true){ // 具体时间
-            // 获取当前年月日
-            Date queryDate = oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) ? queryDTO.getQueryDate() : DateUtils.getDate() ;
-            Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
-            // 结束时间
-            Date endTime = DateUtils.getEndOfDayByDate(startTime);
-            log.info("查询时间范围：startTime={}, endTime={}", startTime, endTime);
-            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+            // 如果时间给了空
+            if(oConvertUtils.isEmpty(queryDTO.getQueryDate())){ // 查询最后一个班次
+                String nowDate = DateUtils.getDate("yyyy-MM-dd");
+                Date startOneTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(nowDate));
+                // 查询最后一次交班记录时间
+                LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+                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);
+            } else {
+                // 获取当前年月日
+                Date queryDate = oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) ? queryDTO.getQueryDate() : DateUtils.getDate() ;
+                Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
+                // 结束时间
+                Date endTime = DateUtils.getEndOfDayByDate(startTime);
+                oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+            }
         }
         // 炉号查询
         if (oConvertUtils.isNotEmpty(queryDTO.getHeatNo())) {
@@ -366,7 +377,6 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                         finalCreateTime = latest.getCreateTime();
                     }
                     detail.setCreateTime(finalCreateTime);
-
                     detail.setHeatNoAmount(totalAmount);
                     detail.setHeatNoWeight(totalWeight);
 

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

@@ -139,26 +139,38 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
             queryWrapper.eq("classes", classes);
             Date endChnageTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
-            queryWrapper.ge("arrival_time", startChnageTime)  // 大于等于开始时间
-                    .le("arrival_time", endChnageTime);   // 小于等于结束时间
+            queryWrapper.ge("arrival_time", startChnageTime).le("arrival_time", endChnageTime);   // 小于等于结束时间
             search = false;
         } else if (oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)) { // 时间范围
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
-            queryWrapper.ge("arrival_time", startTime)  // 大于等于开始时间
-                    .le("arrival_time", endTime);   // 小于等于结束时间
+            queryWrapper.ge("arrival_time", startTime).le("arrival_time", endTime);   // 小于等于结束时间
             search = false;
         }
         // 如果什么条件都没有默认当日
         if (oConvertUtils.isNotEmpty(queryDate) || search == true) { // 具体时间
-            // 获取当前年月日
-            queryDate = oConvertUtils.isNotEmpty(queryDate) ? queryDate : DateUtils.getDate("yyyy-MM-dd");
-            Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
-            // 结束时间 减一个小时
-            Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);
-            log.info("查询时间范围：startTime={}, endTime={}", startArrivalTime, endArrivalTime);
-            // 修改时间范围查询条件为 >= startTime 且 <= endTime
-            queryWrapper.ge("arrival_time", startArrivalTime)  // 大于等于开始时间
-                    .le("arrival_time", endArrivalTime);   // 小于等于结束时间
+            // 如果时间给了空
+            if(oConvertUtils.isEmpty(queryDate)){ // 查询最后一个班次
+                String nowDate = DateUtils.getDate("yyyy-MM-dd");
+                Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(nowDate));
+                // 查询最后一次交班记录时间
+                LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+                changeQueryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo).orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
+                BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
+                // 查询确认时间为 null 或者  班次记录
+                queryWrapper.and(wrapper ->
+                        wrapper
+                                .isNull("confirm_time")
+                                .or(
+                                        wrapper2 -> wrapper2
+                                                .ge("arrival_time", oConvertUtils.isEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startArrivalTime)
+                                )
+                );
+            } else {
+                Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
+                // 结束时间
+                Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);
+                queryWrapper.between("arrival_time", startArrivalTime, endArrivalTime);
+            }
         }
         // 炉号查询
         if (oConvertUtils.isNotEmpty(heatNo)) {
@@ -180,6 +192,8 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
         if (oConvertUtils.isNotEmpty(brandNum)) {
             queryWrapper.eq("brand_num", brandNum);
         }
+        // 打印sql语句
+        log.info("{}{}", "打印sql语句：", queryWrapper.getSqlSegment());
         // 根据到站时间排序
         queryWrapper.orderByDesc("arrival_time");
         IPage<StorageBillPrint> pageList = storageBillPrintService.page(page, queryWrapper);