储运中心导出完善棒一数据的牌号显示

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/carUnit/service/impl/CarUnitServiceImpl.java

@@ -1821,6 +1821,21 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
 
                 String spec = Optional.ofNullable(sameSizeList.get(0).getSpec()).orElse("Unknown");
 
+                String billetNo = Optional.ofNullable(sameSizeList.get(0).getBilletNo()).orElse("");
+
+                String brandNum = "5"; // 默认值
+
+                BilletBasicInfo billetBasicInfo = billetBasicInfoService.getOne(
+                        new LambdaQueryWrapper<BilletBasicInfo>()
+                                .eq(BilletBasicInfo::getBilletNo, billetNo)
+                                .orderByDesc(BilletBasicInfo::getCreateTime)
+                                .last("LIMIT 1")
+                );
+
+                if (billetBasicInfo != null && billetBasicInfo.getBrandNum() != null) {
+                    brandNum = billetBasicInfo.getBrandNum();
+                }
+
                 StorageCenterHeatNoInvoicingVO.SizeDetail sizeDetail = new StorageCenterHeatNoInvoicingVO.SizeDetail();
                 sizeDetail.setSize(Integer.valueOf(size));
                 sizeDetail.setSizeAmount(sameSizeList.size());
@@ -1832,6 +1847,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                 rollSendDetail.setAmount(sameSizeList.size());
                 rollSendDetail.setWeight(sizeWeight);
                 rollSendDetail.setSpec(spec);
+                rollSendDetail.setBrandNum(brandNum);
                 rollSendDetail.setCreateTime(latestCreateTime);
                 rollSendDetailList.add(rollSendDetail);
             }
@@ -1976,7 +1992,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                     chargeDetail.setBtype(Optional.ofNullable(bill.getBtype()).orElse("未知"));
                     chargeDetail.setHeatNo(heatNo);
                     chargeDetail.setCarNum(Optional.ofNullable(bill.getCarNum()).orElse(1));
-                    chargeDetail.setBrandNum(Optional.ofNullable(bill.getBrandNum()).orElse(""));
+                    chargeDetail.setBrandNum(Optional.ofNullable(bill.getBrandNum()).orElse("5"));
                     chargeDetail.setCreateTime(Optional.ofNullable(bill.getOutTime()).orElse(new Date()));
                     rollTwoHeatNo.getRollChargeDetails().add(chargeDetail);
                 }
@@ -2357,7 +2373,7 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
         row.setAmount(detail.getAmount());
         row.setTotalWeight(detail.getWeight());
         row.setCcmNo(ccmNo);
-        row.setBrand(detail.getBrandNum());
+        row.setBrand(getBrandNum(detail.getBrandNum()));
         row.setWeightPerPiece(calcWeightPerPiece(detail.getWeight(), detail.getAmount()));
         BigDecimal result = BigDecimal.valueOf(detail.getSize()).divide(BigDecimal.valueOf(1000));
         if (result != null) {