海运已装单bug

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -234,11 +234,13 @@ public class ShipmentLoadExcelExportListener2 {
                                 List<OrderItemDO> orderItems = boxPreload.stream().map(item -> orderItemService.getOrderItem(item.getOrderItemId())).collect(Collectors.toList());
                                 for(OrderItemDO item : orderItems) {
                                     List<OrderWarehouseInDO> orderWarehouseInDOS = orderWarehouseInService.selectList(OrderWarehouseInDO::getOrderItemId, item.getOrderItemId());
+                                    boolean addColorFlag = true;
                                     for (OrderWarehouseInDO orderWarehouseInDO : orderWarehouseInDOS) {
                                         if (CollectionUtil.isNotEmpty(orderWarehouseInDO.getOrderWarehouseInDetailsVOList())) {
                                             int andIncrement = colorRowNum.getAndIncrement();
                                             colorMap.put(String.valueOf(andIncrement),colorList.get(colorIndex));
                                             colorRowList.add(andIncrement);//这里加1是为了设置颜色时过滤掉入仓记录那条
+                                            addColorFlag = false;
                                             break;
                                         }
                                     }
@@ -345,7 +347,9 @@ public class ShipmentLoadExcelExportListener2 {
                                     totalNum = totalNum + item.getWarehouseInInfoVO().getCartonsNum();
                                     totalVolume = totalVolume.add(item.getWarehouseInInfoVO().getVolume());
                                     totalWeight = totalWeight.add(item.getWarehouseInInfoVO().getWeight());
-                                    colorRowNum.getAndIncrement();
+                                    if (addColorFlag) {
+                                        colorRowNum.getAndIncrement();
+                                    }
                                 }
                             }
                             colorRowNum.getAndAdd(2);