储运中心车次信息导出添加根据交班记录导出的逻辑

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/dto/StorageCenterQueryDTO.java

@@ -33,12 +33,21 @@ public class StorageCenterQueryDTO {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date storageTimeEnd;
 
-    @ApiModelProperty(value = "班组")
+    /**
+     * 班组
+     */
     private String shiftGroup;
 
-    @ApiModelProperty(value = "班别")
+    /**
+     * 班别
+     */
     private String shift;
 
+    /**
+     * 交班记录id
+     */
+    private String changeShiftId;
+
     private Integer pageNo;
 
     private Integer pageSize;

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -4189,6 +4189,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Override
     public List<StorageCenterInvoicingVO> storageCenterInvoicingInfoList(StorageCenterQueryDTO queryDTO) {
 
+        BilletHotsendChangeShift billetHotsendChangeShift;
+
         LambdaQueryWrapper<HeatsActuals> billQueryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(queryDTO.getCcmNo())) {
             billQueryWrapper.eq(HeatsActuals::getCasterCode, queryDTO.getCcmNo());
@@ -4202,6 +4204,34 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         if (StringUtils.isNotBlank(queryDTO.getShiftGroup())) {
             billQueryWrapper.eq(HeatsActuals::getShiftGroup, queryDTO.getShiftGroup());
         }
+
+        if(StringUtils.isNotBlank(queryDTO.getCcmNo()) && StringUtils.isNotBlank(queryDTO.getChangeShiftId())) {
+
+            LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+            if ("0".equals(queryDTO.getChangeShiftId())) {
+                queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, queryDTO.getCcmNo())
+                        .orderByDesc(BilletHotsendChangeShift::getCreateTime)
+                        .last("limit 1");
+            } else {
+                queryWrapper.eq(BilletHotsendChangeShift::getId, queryDTO.getChangeShiftId())
+                        .eq(BilletHotsendChangeShift::getCcmNo, queryDTO.getCcmNo());
+            }
+            billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
+
+            if (oConvertUtils.isNotEmpty(billetHotsendChangeShift)){
+                String changeShiftGroup = billetHotsendChangeShift.getShiftGroup();
+                String changeShiftShift = billetHotsendChangeShift.getShift();
+                Date createTime = billetHotsendChangeShift.getCreateTime();
+                Date changeShiftTime = billetHotsendChangeShift.getChangeShiftTime();
+                billQueryWrapper.eq(HeatsActuals::getShift, changeShiftShift);
+                billQueryWrapper.eq(HeatsActuals::getShiftGroup, changeShiftGroup);
+                // 添加时间范围限制
+                if (createTime != null && changeShiftTime != null) {
+                    billQueryWrapper.between(HeatsActuals::getCreateTime, createTime, changeShiftTime);
+                }
+            }
+
+        }
         Date beginDate = queryDTO.getStorageTimeBegin();
         Date endDate = queryDTO.getStorageTimeEnd();
         if (beginDate != null) {