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