diff --git a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
index e1d77d3..bae028f 100644
--- a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
+++ b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
@@ -220,6 +220,9 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
         if (customerPartNo.length < 3){
             throw new RuntimeException("料号"+part+"的客户料号未维护或格式不正确!");
         }
+//        String partBatchNo = baseMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
+        // 改成通过卷号查询
+//        baseMapper.queryRollBatchNo();
         String partBatchNo = baseMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
         String partMCO = baseMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00017");
         String partConfig = baseMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00018");
@@ -266,6 +269,9 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
             // 查询 缓存表数据
             return baseMapper.queryShipmentRollVoList(shipmentVo);
         }
-        return baseMapper.queryTransDetailsub(shipmentVo);
+        return baseMapper.queryTransDetailsub(shipmentVo).stream().map(item->{
+            item.setBoxNoStr(shipmentVo.getShipmentId() + "-" + String.format("%03d", Integer.parseInt(item.getBoxNoStr())));
+            return item;
+        }).collect(Collectors.toList());
     }
 }