Merge remote-tracking branch 'origin/uat-temp-nht-2505230000-47122' into mes-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java

@@ -32,6 +32,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 
@@ -204,6 +205,7 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
                     }
                 }
             }
+            detailModels.sort(Comparator.comparing(ChengDuVolvoShippingPrintDetailModel::getPartPosition));
             detailModels.add(detailModel);
         }
         model.setDetails(detailModels);